Merge "Fix: symbols/bionic/lib64/libc.so is the wrong variant"
am: a60488109c

Change-Id: Ie286ca39b5815896dcd7d15a3b83871d48517073