Merge "Switch "adb sideload" over to lseek/read." am: c0ca39c41a
am: 0cb8c69bf2

Change-Id: Icd04d5c95a46b1a334d8569beb36621a7e1a67cb