Revert "Update AOKP utils"

This reverts commit 379e6825fe4c2ad5c8f13964a3a4c30c4fbc45f0.