Revert "Merge branch 'cm-10.1' of github.com:Ayysir/ASDK into cm-10.1"

This reverts commit 6f0782e1658957cfa44b92cf90236f8b66ac8c8a, reversing
changes made to ed3fe5fe9f985b8634d124232f61bcdda43982b5.