Merge "Reconfig libc's Android.mk to build for multilib"