updated for AOSP builds