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

Change-Id: I334ff3ec18c1b309596a544a2089166b28b90e10