am 06485c81: Merge "Move Teapot to android-17 and set APP_ABI := all"

* commit '06485c81bbc79b02acfbe986e378216adab573c2':
  Move Teapot to android-17 and set APP_ABI := all