Merge "Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9"