Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1

Conflicts:
	prebuilt/Android.mk

Change-Id: I2fe4b8f68f37570f95cc829d6ab2f6cf439c3f05