Merge "Track libcore change 0e393b4d628541e84e31210342f4103315c07e23" am: 50f3429d14 am: 622e170338 am: c57b96bf11
am: c3bc13cd26

Change-Id: I0ba08743a5021d02d9e111a1271af2f63c576ee9