am c9706f02: (-s ours) DO NOT MERGE, ALready merged to master. 1440173 [NJ-1331] MetaData utility parse the wrong m4a meta data. Changes to Java, application side.

Merge commit 'c9706f0262a2f399f95e0d78ba2b7616e08d0069'

* commit 'c9706f0262a2f399f95e0d78ba2b7616e08d0069':
  DO NOT MERGE, ALready merged to master.
tree: a39f41ce752a2909818c95b0c60161c166c6ed42
  1. cmds/
  2. include/
  3. media/