This reverts commit cacb972d. Relanding along with one more fix in prebuilts/ndk Change-Id: I65cbc3c5d72bb47bd00e123c63911c9baa1e5f03 Test: m checkbuild