Merge "Add METADATA to x86: Apache2=NOTICE" am: b72bbb2dfe

Change-Id: Id4d5036680f6d4cdc6be2d6f17713857b9dbdcb6