Merge "ART: Correctly compare in UTF-16 space"
am: 5bf6d2750d

Change-Id: I9bbad07d05fec60aa105f57cb28d95f62a0ab601