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

Change-Id: Ied6c3c941931f52a58a4b10767b17d278dba2316