Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1