am 7e55414f: Merge "make sure screencap\'s data stream matches what adb expects" into jb-mr2-dev

* commit '7e55414f22d10e40e9153a63c4123134aab13ced':
  make sure screencap's data stream matches what adb expects