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

Change-Id: Ia1fde043f68030d5676c39f9eda632061ef09eab