Merge "Add METADATA to armv7-a-neon: Apache2=NOTICE" am: d45b410fbb am: e66d7f0898 am: a8f894ea92 am: 658da96fa6

Change-Id: I76492f83871e76a2d90f2f0b588e75d3a4bc9393