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

Change-Id: I119e978c346aafc61e91aecc5650982f52eb5acb