moto msm8226: reconcile with cm

- clean up the crap

Change-Id: I87a722ce441b302cc4d15d148bc28d090b671b1b