Merge "Revert "Delete unused mk files""