Merge "Migrate libandroid headers to ndk_headers." am: fd9d1fb52b am: c356d61d00
am: 010e7af396

Change-Id: Iff50ea1ca85b1702881203a51f14a0bff09ab2e3