Merge "Track libcore change 69860bf2b28f0e14741a8895abdb77b45d1ed55d" am: c0d71fa38a am: 3556fd53a2 am: 95322ffdde
am: 4103219402

Change-Id: Iadadfa8f8be5539fffa27c89ab7ebb74ada694e4