Track AOKP's frameworks_base