Use a hashed MAC address instead of IMEI for stats collection.

PS2: always use hashed Wifi MAC address to avoid zombies when wiping

Change-Id: I7379c5b380273e35b5aab582f5268d6946e0a255
Adjust aokpstats

Change-Id: I7f40da5313b0754862aab40db06555d752a719d8
Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>
Revert "Add PerformanceControl Quick Link in Settings"

This reverts commit ce3b02a64889fd3f2a535045c5a042a616871bc6

Change-Id: Ic7c04d3acb10d8b8decfe0e99e23f6715896bc07

Conflicts:
	res/xml/settings_headers.xml
	src/com/android/settings/Settings.java
DataUsageSummary: fix mobile data usage display for GSM devices with no number

Some providers don't write phone number onto SIM card causing the
phone number check introduced in the partially reverted commit to fail.
Re-introduce the original check with the "or" condition.

This partially reverts commit 4c51b45355b9d6fed973f946738bf455a8b7c9ea.

Change-Id: I69a65a1a421dcdf168c3d0afeb7110cb97790034