Merge "MediaFormat: fix javadoc for AAC-related keys" into pi-dev
am: 1b3ef3cb7d

Change-Id: I75f8fffea0bcc873e0b7aed257c30d8a03f97f29