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