Merge "Remove workaround for x86 ifunc"
am: b2a29cb95b

Change-Id: I32a2f3252d0704fa893c031c2c59a16736ef570f