am 3f6c9bae: am 921113d5: Merge "use the bitmap stride when encoding a screenshot as PNG" into jb-mr2-dev

* commit '3f6c9bae6302983d37b3a00523b8c8066fd3caa9':
  use the bitmap stride when encoding a screenshot as PNG