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

* commit '6701a4492350169aa41f66c9c79ece0ba0b280b7':
  Audio and video bitrate are now configurable through system properties