Merge "Track libcore change 162bf4d3d62da1e581e7a40e01f5ad664f0507ef"