Merge "Don't send short URB packet when sending MtpDataPacket." into nyc-mr2-dev
am: e3ebcffe41

Change-Id: Id8290878d7bc7f9ed5a70dd2b04471597467b787