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

Change-Id: Ia8602f0eb3ab04e8d681020d6854e5570bd5eaa7