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

Change-Id: Id9a5b31c2f7dd9205e5b03108bc73c5d4b65fe18