Modified AOSP files for mako