Merge "Add METADATA to frameworks/native: Apache2+MIT+BSD+UNICODE=NOTICE" am: e9b40dab06 am: b731a73f7c

Change-Id: I3add29e3b83ba3fc8e984626291004924d2651bf