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

Change-Id: I39d19a30d34b2c2f13a0be9609972e332a86c014