Re-preparing for AOSP