Merge "Update libc/Android.bp to match libc/Android.mk"