Merge "Add missing symbols to android-16 libc"