Merge "adb: defuse CHECK on IOVector::append of an empty block." am: 5c58e092f3
am: c923599e0c

Change-Id: Iab58ded15e69a08176e586d2cdee46b3f742e56a