Merge "Migrate libandroid headers to ndk_headers."
am: fd9d1fb52b

Change-Id: I3762d8549bc449283c874f420d0fa72bda40f244