Merge "Fix libcore buildbot failure."