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

Change-Id: I264f16ed2a59b15c83bdd585f2c6542f11093864