Merge "Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce" into nyc-dev am: 8c205b5
am: 15d254c

* commit '15d254ca74aa054c8eb17f8e8a5fdabaaa9b8daf':

Change-Id: Ib45f938a9604c972651f6eab41ee8c367039665b