Merge "Track libcore change 0e393b4d628541e84e31210342f4103315c07e23"
am: 50f3429d14

Change-Id: I2fdd89afd9cfc0cc36be2664dee559e7b0977c6d