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

Change-Id: Ibc624034478689ad1208e5da15835a6acd2d796a