update mako to be more like AOSP