Merge "Avoid duplicate class for mark compact"