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

Change-Id: If6819e397dbb927974ee8ef380865d10b11114a1