am a9654dd4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'a9654dd4':
  Better video bandwidth utilization by not lying about the frame rate.
  Various improvements to cleanly shutdown a wfd session.
  Audio and video bitrate are now configurable through system properties
  Use proper number of video buffers to be acquired simultaneously from
  Throttle SurfaceMediaSource.