Merge "Add METADATA to mockwebserver: Apache2=NOTICE" am: a72b6a4e4d am: 78f39a0b3d am: c2e0629d0a am: b3129f8c9b am: 8e39263c3e

Change-Id: Ic4374751e05bb145f3fd752b3745b52a36f29522