Merge "ART: Fix memcmp16_test typo" am: 9ffad492d8 am: f2c818290d
am: 01bb475d7c

Change-Id: Idcfc65f38cbc9cb3234d24c900496ff7f59c153b