android: Switch safe_struct over to new codegen

Change-Id: Ia89cfec2b836437c2f2009608795d1ee38b811ad
diff --git a/build-android/android-generate.sh b/build-android/android-generate.sh
index e081b1c..09022a3 100755
--- a/build-android/android-generate.sh
+++ b/build-android/android-generate.sh
@@ -21,8 +21,8 @@
 rm -rf generated
 mkdir -p generated/include generated/common
 
-python3 ../scripts/vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated/include
-
+( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_safe_struct.h )
+( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_safe_struct.cpp )
 ( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_struct_size_helper.h )
 ( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_struct_size_helper.c )
 ( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_enum_string_helper.h )