tree 6f284705b0ba3a89c68c368e16a50b7fc90910ad
parent 970293eeb8666e7d55d918d5ba55d52f82061f89
parent c4ed36ca3763cfdc0f8e7f7a5734134c3653debd
author Xin Li <delphij@google.com> 1485316875 +0000
committer android-build-merger <android-build-merger@google.com> 1485316875 +0000

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