Merge "Request mksh patches to be submitted upstream."