Merge "Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9"
am: ec3e884e88

Change-Id: Ibf708f685bf8cb8e5f88423b48ed05986c223651