Modify for AOSP builds