Merge "Track libcore change 76fa41aa4ac891670446592243b654fac7deb53f"