Merge "Manually update the libcore native code."