Merge "Migrate libandroid headers to ndk_headers."