diff --git a/prefab/curl-ssl/app/src/main/cpp/CMakeLists.txt b/prefab/curl-ssl/app/src/main/cpp/CMakeLists.txt
index f57927dd6..e46c8e49d 100644
--- a/prefab/curl-ssl/app/src/main/cpp/CMakeLists.txt
+++ b/prefab/curl-ssl/app/src/main/cpp/CMakeLists.txt
@@ -21,6 +21,5 @@ find_package(curl REQUIRED CONFIG)
 find_package(jsoncpp REQUIRED CONFIG)
 
 add_library(app SHARED app.cpp http.cpp logging.cpp)
-set_target_properties(app PROPERTIES CXX_STANDARD 17)
 target_compile_options(app PRIVATE -Wall -Werror)
 target_link_libraries(app ${LIBLOG} curl::curl jsoncpp::jsoncpp)
diff --git a/prefab/prefab-dependency/app/src/main/cpp/CMakeLists.txt b/prefab/prefab-dependency/app/src/main/cpp/CMakeLists.txt
index d87c84b34..7151d61d3 100644
--- a/prefab/prefab-dependency/app/src/main/cpp/CMakeLists.txt
+++ b/prefab/prefab-dependency/app/src/main/cpp/CMakeLists.txt
@@ -20,6 +20,5 @@ project(app VERSION 1.0.0 LANGUAGES CXX)
 find_package(jsoncpp REQUIRED CONFIG)
 
 add_library(app SHARED app.cpp logging.cpp)
-set_target_properties(app PROPERTIES CXX_STANDARD 17)
 target_compile_options(app PRIVATE -Wall -Werror)
 target_link_libraries(app jsoncpp::jsoncpp)
diff --git a/sanitizers/app/src/ubsan/jniLibs/arm64-v8a/libclang_rt.ubsan_standalone-aarch64-android.so b/sanitizers/app/src/ubsan/jniLibs/arm64-v8a/libclang_rt.ubsan_standalone-aarch64-android.so
index cb60e3b1e..711be83c8 100644
Binary files a/sanitizers/app/src/ubsan/jniLibs/arm64-v8a/libclang_rt.ubsan_standalone-aarch64-android.so and b/sanitizers/app/src/ubsan/jniLibs/arm64-v8a/libclang_rt.ubsan_standalone-aarch64-android.so differ
diff --git a/teapots/choreographer-30fps/src/main/cpp/CMakeLists.txt b/teapots/choreographer-30fps/src/main/cpp/CMakeLists.txt
index 4641e44d0..02f9185be 100644
--- a/teapots/choreographer-30fps/src/main/cpp/CMakeLists.txt
+++ b/teapots/choreographer-30fps/src/main/cpp/CMakeLists.txt
@@ -33,13 +33,6 @@ add_library(${PROJECT_NAME}
     TeapotRenderer.cpp
 )
 
-set_target_properties(${PROJECT_NAME}
-  PROPERTIES
-    CXX_STANDARD 11
-    CXX_STANDARD_REQUIRED YES
-    CXX_EXTENSIONS NO
-)
-
 # Export ANativeActivity_onCreate(),
 # Refer to: https://github.com/android-ndk/ndk/issues/381.
 set_target_properties(${PROJECT_NAME}
diff --git a/teapots/classic-teapot/src/main/cpp/CMakeLists.txt b/teapots/classic-teapot/src/main/cpp/CMakeLists.txt
index 20279e1e3..10afb7dd9 100644
--- a/teapots/classic-teapot/src/main/cpp/CMakeLists.txt
+++ b/teapots/classic-teapot/src/main/cpp/CMakeLists.txt
@@ -32,12 +32,6 @@ add_library(${PROJECT_NAME}
     TeapotNativeActivity.cpp
     TeapotRenderer.cpp
 )
-set_target_properties(${PROJECT_NAME}
-  PROPERTIES
-    CXX_STANDARD 11
-    CXX_STANDARD_REQUIRED YES
-    CXX_EXTENSIONS NO
-)
 
 # Export ANativeActivity_onCreate(),
 # Refer to: https://github.com/android-ndk/ndk/issues/381.
diff --git a/teapots/common/ndk_helper/CMakeLists.txt b/teapots/common/ndk_helper/CMakeLists.txt
index c020b9a7b..b596b798d 100644
--- a/teapots/common/ndk_helper/CMakeLists.txt
+++ b/teapots/common/ndk_helper/CMakeLists.txt
@@ -17,11 +17,14 @@ add_library(NdkHelper
     tapCamera.cpp
     vecmath.cpp
 )
+# TODO: Remove this
+# This does not do what it looks like it does. It looks like it's redundant with
+# the target_include_directories(... PUBLIC ...) below. What it's actually doing
+# is re-exporting the headers for every library linked below. This is how all
+# the teapots samples are getting their native_app_glue. They should depend on
+# it explicitly.
 set_target_properties(NdkHelper
   PROPERTIES
-    CXX_STANDARD 11
-    CXX_STANDARD_REQUIRED YES
-    CXX_EXTENSIONS NO
     INTERFACE_INCLUDE_DIRECTORIES $<TARGET_PROPERTY:NdkHelper,INCLUDE_DIRECTORIES>
 )
 target_include_directories(NdkHelper
@@ -29,6 +32,10 @@ target_include_directories(NdkHelper
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
+# TODO: Audit, make private.
+# Some of these are here because it was a common location to link the
+# dependenices of the various teapot samples. Those samples should link their
+# dependencies explicitly.
 target_link_libraries(NdkHelper
   PUBLIC
     native_app_glue
diff --git a/teapots/textured-teapot/src/main/cpp/CMakeLists.txt b/teapots/textured-teapot/src/main/cpp/CMakeLists.txt
index 646785cda..6e10022eb 100644
--- a/teapots/textured-teapot/src/main/cpp/CMakeLists.txt
+++ b/teapots/textured-teapot/src/main/cpp/CMakeLists.txt
@@ -43,12 +43,6 @@ add_library(${PROJECT_NAME}
     Texture.cpp
     AssetUtil.cpp
 )
-set_target_properties(${PROJECT_NAME}
-  PROPERTIES
-    CXX_STANDARD 11
-    CXX_STANDARD_REQUIRED YES
-    CXX_EXTENSIONS NO
-)
 target_include_directories(${PROJECT_NAME} PRIVATE ${commonDir})
 
 target_compile_options(${PROJECT_NAME} PRIVATE -Wno-unused-function)