re-track some AOSP stuff for now