m7: Build fixup after updates for new battery, board & OTG drivers

PS1: AICPifyng new drivers

Changes to get the following patches to build:
- http://gerrit.aicp-rom.com/#/c/241/
- http://gerrit.aicp-rom.com/#/c/242/
- http://gerrit.aicp-rom.com/#/c/243/
- http://gerrit.aicp-rom.com/#/c/244/
- http://gerrit.aicp-rom.com/#/c/245/

I'm not 100% sure if all my merges are correct as far as
adding something from the CM version vs deleting something
from the AICP version, but I was able to build and run
on my M7 without any noticeable problem.

PS2: Removed whitespaces in include/linux/usb/otg.h

Change-Id: I1225badd3636066a7e58d00cb3fcac72e58426c3