am 2a5177e8: Merge "GraphicBufferSource fixes" into jb-mr2-dev

* commit '2a5177e8a72585b6f4da972d86f436d31cd4674a':
  GraphicBufferSource fixes