am 9544df07: am e88fe7f4: am 94fed1c5: Merge "Track libcore API update."

* commit '9544df0767b7e3e7d9f807cb2290cd3afba73b7a':
  Track libcore API update.