am ddf8fe50: Merge "Fix isUsbMassStorageConnected() will always return true" into gingerbread

Merge commit 'ddf8fe505636d3b4435cb9952266765aab20b86d' into gingerbread-plus-aosp

* commit 'ddf8fe505636d3b4435cb9952266765aab20b86d':
  Fix isUsbMassStorageConnected() will always return true