Merge "make sure screencap's data stream matches what adb expects" into jb-mr2-dev