Revert "Merge remote-tracking branch 'omapzoom/p-android-omap-3.0' into cm-10.1"

This reverts commit 18ce5771e0656ff14205a67099e0095ec12d9dd1, reversing
changes made to 98c57e4fec7fd5d1c9626d355c7227ad283996f9.