Merge "Revert mako to kernel logging to workaround prebuilt issue DO NOT MERGE"