4.3 re-aosp-ize