Second pass at touch requirements, fixes display:
*Touch is not registering on Mako, need to check other devices.

CWM 6.0.4.5 REBASE:
*This is the secdon of several commits in which I'm rebasing COTR over CWM 6.0.4.5.
*This retains CWM history while giving a chance to clean up COTR modifications.

ALL OF THESE COMMITS SHOULD BE CLEANED AND REBASED BEFORE MERGING WITH COTR.