Merge remote-tracking branch 'aosp/jb-mr1.1-release' into jellybean

Conflicts:
	charger/Android.mk

Change-Id: I5dd903c170c711cf43a0c1b7ee5f1f7876ea22e1
Merge remote-tracking branch 'pa/jellybean' into jellybean