am 8d4122f2: Merge "Get rid of platform-specific method inliners."

* commit '8d4122f24d1d964e91444300045936b42986e00e':
  Get rid of platform-specific method inliners.