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

Change-Id: I70e2b153d2012160268c2ab6b77364aacbe168ae