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

Change-Id: Idd3f467fb32f08a826339edcaf52c1394c832597