Merge "Add METADATA to mini-emulator-armv7-a-neon: Apache2=NOTICE" am: 7b64f1f42f am: 537f5bafdc am: 318968436b am: 29b1262c7c am: 17c0a3feb8

Change-Id: I776ed3ca9de8e4f8c74459d34b309935f3a8e849