Revert "Backported /drivers/staging/android from 3.4 kernel"

This reverts commit 643d26829e0e5e743bffc0b1ddf1db8ca6db7198.