Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968 am: 9ede567f7c
am: 61bb0a9ef4

Change-Id: Ib54b94c34d48fb7c359c01612bbcb70a4f9dd8a5