prebuilt move back to AOSP