Merge "Always set sys.usb.ffs.mtp.ready during configure"
am: 2eb29c0d79

Change-Id: I890e74316a04fee3e74f90b6e640e0b527c8a57d