Merge remote-tracking branch 'refs/remotes/koush/master' into jb-4.2

Conflicts:
	Superuser/res/values/styles.xml

Signed-off-by: travp624 <travp624@gmail.com>