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

Conflicts:
	default.xml
	kernel_manifest.xml

Change-Id: I150f091eaeeef636b6bc5a5f43f5eea3750ed1f9