Revert "Merge remote-tracking branch 'androidarmv6/cm-10.2' into cm-10.2"

This reverts commit aeb022be709274b18693aadd47e5f16a93d480ec, reversing
changes made to bcb88c6ae382193580031e598b09689274b455ec.