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

Change-Id: Iadb6a15b3d160b29014f5c55a2b3d89b6baa4a31