Don't assume OUT_DIR is not overridden.  This fixes build when OUT_DIR is outside the toplevel source tree.
am: 63eb6759f7

Change-Id: I2023521fc87d74b817006d768eb54eeb785ae690