Merge "ART: Remove unused JobjectComparator." am: 07a8adec76
am: a5ea67bf9c

Change-Id: I064181f1ff8d833261eb44c146348db3729e15f3