Merge "Add license to ndk_headers." am: b1d6844f1d
am: 5076d453e7

Change-Id: If51b7044cca8871a8ed599941d2f6edc275db3a4