changes from aokp