Merge remote-tracking branch 'rootbox/jb-mr1' into HEAD

Conflicts:
	packages/SystemUI/AndroidManifest.xml
	services/java/com/android/server/am/BatteryStatsService.java