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

Conflicts:
	default.xml
	kernel_manifest.xml

Change-Id: I41b5b37f55aa2d76f4787840e723ca06ac98e0a3