Merge "Add license to ndk_headers." am: 2dd8f16e44
am: 0c1c942de3

Change-Id: I13c02ef01ad09918f72446e23b9f6128d4007a50