Merge "Audio and video bitrate are now configurable through system properties" into jb-mr1-dev