Merge "Track libcore change 9b7cfceb7b825835730f7977d4935dec3ff1a3be"
am: 4af3afb

* commit '4af3afb2419365f0733fbaa104d05242620840ac':
  Track libcore change 9b7cfceb7b825835730f7977d4935dec3ff1a3be

Change-Id: Ia9f3c4f3d138ed988c074d6e37cdd5997db1f46f