Add some more AOSP flavor to Mako