Merge "Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9" am: ec3e884e88 am: 29d6af7fe7 am: 0cf19a9a27
am: 4ffbf4e72f

Change-Id: Ifa2373f5f98283cf616c9a64be0346f3d7b917e9