Merge "adb: set max_rw to USB_FFS_BULK_SIZE explicitly" am: b63d47356a
am: d59b93a5f5

Change-Id: I7c515a34977c172babb80929a0f41bc4cb0e4148