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

Change-Id: I131617e15d553ff74a6162c916cae6ca40de17e5