Bai bai 98tweaks

Thanks to the headsup from morfic/simms @ http://forum.xda-developers.com/showpost.php?p=41303784&postcount=3225

Change-Id: Iff063d3dc3bfac62cda1f94204eeef4921c638a0
Fix cherrypick
Merge branch 'jb2' of https://github.com/CarbonDev/android_vendor_carbon into CB