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

Change-Id: I1f40a38c9cef1baefd2ca3c80cc0d085bf82766e