Update for full AOSP build