Merge "Add METADATA to mp4parser: Apache2+MIT=NOTICE" am: 5b969a5a51 am: 47c6ee108c am: cdf4cf5c8e am: fcd99badc4 am: 00e6fe8fab

Change-Id: I946bcdd9a17e322d04acdb2944c853d6fb8acfb1