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

Change-Id: Ib5cc25824e3142c3c25e3f34a167cd3dfed08397