mondrianwifi: Improve USB-OTG config

I believe the prior config would only allow a single USB drive
to be plugged into a hub and the new config may allow multiple
drives to be used at once.

Change-Id: If7e3c5b0be7b94d18e82a47ba612565c3a145548
mondrianwifi: recovery: Disable secure discard

Improves the time it takes to wipe ext4 partitions in recovery.

Change-Id: Id0b35bfc179345c0f89c4d928767614dbdfe3242
Merge branch 'crpalmer' into HEAD