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

Change-Id: I697241f5ad2af3a9a7e87eab3e43ffe52e175020