Merge "Add license to ndk_headers." am: c741dd4838 am: e69242a71b
am: 2789708444

Change-Id: I17b067f1a150e21c3151a85cd57ea1acae538c03