Revert "Track AOKPs system_extras & vold"