Just a whole lot of cleanup merged from cm/cm-10.1 into jb-4.2

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