Modified AOSP files for tilapia