Revert "Merge branch 'seandroid-4.2' into cm-10.1"

This reverts commit 93359dea405ff00bad48b0505876a529f766c6f8.