Merge "Really move dalvik off bionic's __memcmp16."