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

Change-Id: I42e41cf86a8b276ba721321b1ccb82ebb9e77822