am 97a67cc2: Merge change 7544 into donut
am 97a67cc2: Merge change 7544 into donut

Merge commit '97a67cc281805566d429d4ca6570348fcf6dabd9'

* commit '97a67cc281805566d429d4ca6570348fcf6dabd9':
  sdutil: Up the mount/unmount wait times to account for disk check + reaper time

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base