Revert "moto msm8226: reconcile with cm"

This reverts commit 59c4420dd40e47b2010b02346e8f40b12105ad54.

ps2 fix white space
Change-Id: I20d55da8aa8ae87466a32ca1b6b43a2be0a39f05