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

Change-Id: If7fa84ac75055b9765deca4123480176f1b2c7b0