Merge "Add bitrate information to metadata for AAC."
am: 600fd56c08

Change-Id: I2b7e49db7efa9cd5025e8692ebb49b2cc30c6273