Merge "Track libcore change 162bf4d3d62da1e581e7a40e01f5ad664f0507ef"
am: aeec0e06c9

Change-Id: Ief3cd9210d4cd48edfc16c8fa1ece2c77a0ad170