base: AOSCP fix some stuff to use our changes with aosp