Merge "Track libcore change e2f147b9b14c7645f29e92758f811a18258feef4" am: 4c7169fadf
am: 90aac416fa

* commit '90aac416fab1cdfb91d25f6c6be75654cba67c4f':
  Track libcore change e2f147b9b14c7645f29e92758f811a18258feef4

Change-Id: I65ebb5bf234c2a50193642ba05acc9560bff3e26