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

* commit '88dd3464b072bdae72b07605dd0b94786e36b253':
  make sure screencap's data stream matches what adb expects