Merge "Add METADATA to mp4parser: Apache2+MIT=NOTICE" am: 5b969a5a51

Change-Id: I66b17ac7f93ea5686c5904ce8b1f8bf2f1baea50