Revert "Merge branch 'lollipop' of https://github.com/INFAMOUS-LOLLIPOP/android_vendor_infamous into lollipop"

This reverts commit 7715e3c8271c422b3651c92e773ad08e22ed6fd7, reversing
changes made to 50ee24faaad0c88c23dd5a77a1e45e8f8872dba3.