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

Change-Id: I7c68f07808bd519f2ddd01476b4bf9b699b8388d