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

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