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

Change-Id: I866343af8475ec811e1592a897c3aef03cc4ffb6