Revert "Include fixes for fix for last merge :P"

This reverts commit 3dcc284f5315bf8c1f7fce4c2f1f434d50c7443c.
Revert "Compile fixes for last merge"

This reverts commit eb3c717196887f4ecab9c08abc6afb947867c525.
Revert "Merge commit 'fbad46f30d0ccb24fcadf4fa129d917fd0bfa1fe' into android-omap-3.0"

This reverts commit 392a6658b74ef38e182bed8c2e577a2728056c26, reversing
changes made to c80bab2e500b1ce666894cd9ee1a527568c5f901.
Fixed LGE Blockingmonitor includes