Add AOSP (KK) support