Merge "Add license to ndk_headers." am: cf39459d1f
am: 0f3445be83

Change-Id: Id999bddc033e2958047949640c250f0dde3729af