Merge "Add METADATA to audio: Apache2+BSD=NOTICE" am: 9cf0a11959 am: c14a73d033

Change-Id: I280452e148abcd633d7e0ffd85fb72a49ca6b72a