Merge "Track libcore change 162bf4d3d62da1e581e7a40e01f5ad664f0507ef" am: aeec0e06c9 am: 72d823a386
am: 725be0c7ff

Change-Id: I4022f991159751e6ad43a405ce5305f6197e8412