Merge "Increases fastbootd response message size" am: 9b7d688ea4 am: 815f9e4534

Change-Id: I7e893bb2bc680af09ead32ab1c4a8348ef8a39d5