am 60c60963: Fix build, post removing apis

* commit '60c60963fc92a051cb3f364d4ecdd6a3b56ef490':
  Fix build, post removing apis