Merge "Fix ifunc_test for hwasan builds." am: 38558bad85

Change-Id: I72ac610eb8c46ad7194bf9da861c3144fa8c73fb