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

Change-Id: Iff0e25d5eced8e7963536bf127a869ec52e419c8