Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d"