am 505974eb: Merge "Track libcore API update."

* commit '505974eb736218d40b1d648ea4af548167a381b1':
  Track libcore API update.