am 823f5bf3: Merge "MTP: Use SharedPreferences for MTP device properties rather than sqlite3" into honeycomb-mr1

* commit '823f5bf3db8b2f588ae917aaff5d27a65c87f132':
  MTP: Use SharedPreferences for MTP device properties rather than sqlite3