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

Change-Id: I419b8cbe9be2f1aa81260ef142a9b469d93721de