Switch back to aokp on some things

No need in tracking these localing anymore, so switch back to AOKP

Change-Id: I7d4d072b64406e5c19f2a830650f5d5e10399b12