Merge "Switch MtpFfsHandle to aio, add control functions." am: 82651d413e
am: 68ce743ef9

Change-Id: I0c48eda2effb4bc72ebdd98c64570684da43a0e2