Add AOSP version 2