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