Merge "Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9" am: ec3e884e88
am: 29d6af7fe7

Change-Id: I6693fe79836e88d022d393d2bee5d811cb2dcdfc