Merge "New MediaFormat keys for AAC" into lmp-dev