Merge "Make static ifunc resolvers optional." am: 5e15f34c50
am: 460e80186f

Change-Id: I325cdf45cbcce687e476c78b54a9138205b06851