Merge \"Avoid duplicate class for mark compact\"
am: 3fa401661e

Change-Id: Ibc263ea7d114d62515c951ab45dc460ca74c6565