Upstream Merge + CM Advanced Re-commit

Change-Id: Ica783c3c175ecafd1dade07f8831d263d4f8f479
Merge branch 'jellybean' of github.com:ParanoidAndroid/android_packages_apps_Settings into jellybean-legacy
-new pie options
Merge branch 'jellybean' of github.com:ParanoidAndroid/android_packages_apps_Settings into jellybean-legacy
Add option to disable PIE

Change-Id: Ieebee129123fc671f408a9f17aa82e31731a59db
DERP: 'Disable Pie' missing string value

Change-Id: I05bbbd1553fd39a2b4ebfad8b2575b299bef1852
DERP 2: String defined

Change-Id: Ifc9d27583faa8e6ef4de76a400acae37e889fea0
PIE disable Clean-up + Derp Underp

Change-Id: If4496d1ca940a79572c045fbd410b390c203463e
Settings: fix storage measurement for device without emulated sdcard

StorageMeasurement: misc files should only be measured for internal
storage only if it is the emulated storage, otherwise misc count
for the primary storage will be erroneously duplicated on the
internal storage count.

StorageVolumePreferenceCategory:
  - Always create mMountTogglePreference to avoid null pointer
    exception for code that relies on it existing
  - Check if the keys exist before calculating totalValues to
    avoid null pointer exception on storage where media is not
    calculated
  - For available/readonly, set title, not summary (summary is
    supposed to be the amount available)

Change-Id: Ib217f79ee562dffc514696fff038e58ed0dba7d9
Settings: use DefaultContainerService for all file operations

For devices with non-emulated storage, the system uid is not allowed
to access the storage (to prevent system_server from being killed
on UMS mount). Old code remain that make file access directly, change
those to use DefaultContainerService

Depends on http://review.cyanogenmod.org/28179

Change-Id: Ie6bdaf27249daeabdc7f0ef1d73d484764ee35f0
Merge pull request #8 from bluefa1con/jellybean-legacy

Jellybean legacy commits
Merge branch 'jellybean' into jellybean-legacy

Conflicts:
	res/values/strings.xml

Change-Id: Id4de7f7b759df8b5d0a61fc3d961d5ca4f64859a
Merge branch 'jellybean' into jellybean-legacy
Merge branch 'jellybean' into jellybean-legacy
Merge branch 'jellybean' into 'jellybean-legacy'
Merge branch 'jellybean' into 'jellybean-legacy'
Merge branch 'jellybean' into 'jellybean-legacy'
Merge branch 'jellybean' into 'jellybean-legacy'
Merge branch 'jellybean' of github.com:ParanoidAndroid/android_packages_apps_Settings into jellybean-legacy
Add LockClock from CM10.1

Change-Id: Ia21ec9b6dd0f2585d699742253edcbddc92e69be