am 0ab4d866: Merge "Correct MediaCodec + Surface behavior" into jb-mr2-dev

* commit '0ab4d86643dfb668a583c13b8bd61b589dbe8602':
  Correct MediaCodec + Surface behavior