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