Merge "Remove workaround for x86 ifunc" am: b2a29cb95b
am: e8384f9230

Change-Id: Iae668ee0d60c32451723eb9d5f53e2abe06b1844