Merge "Track libcore change e2f147b9b14c7645f29e92758f811a18258feef4"
am: 4c7169fadf

* commit '4c7169fadf9bc1eeac04635312fba8fb8e278693':
  Track libcore change e2f147b9b14c7645f29e92758f811a18258feef4

Change-Id: I06f2de0cc88cb7eabca69ebd0cefeead1d7feed3