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

Change-Id: I8c139c92cf11bbdf1ffac2aa7f5204b0513bf6f5