Revert "Cure error: unterminated #ifdef"

This reverts commit c3ec95642658ee87ea8db8b385f544e0c02e7271.
Revert "fastcharge: initial adaptation for Moto X"

This reverts commit 84bf44c3fe94b6110dd75cfa091f6213c33f8a8d.