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

Change-Id: I0d5c8158210e17161cf9f9310f5f94457f79a8e2