diff --git a/libretro-common/formats/png/test/Makefile b/libretro-common/samples/formats/png/Makefile
similarity index 82%
rename from libretro-common/formats/png/test/Makefile
rename to libretro-common/samples/formats/png/Makefile
index f7d89ed170..43e127041a 100644
--- a/libretro-common/formats/png/test/Makefile
+++ b/libretro-common/samples/formats/png/Makefile
@@ -1,6 +1,7 @@
 TARGET := rpng
 
-LIBRETRO_PNG_DIR  := ..
+CORE_DIR          := .
+LIBRETRO_PNG_DIR  := ../../../formats/png
 LIBRETRO_COMM_DIR := ../../..
 
 HAVE_IMLIB2=1
@@ -13,9 +14,11 @@ LDFLAGS += -lImlib2
 endif
 
 SOURCES_C := 	\
-	rpng_test.c \
+	$(CORE_DIR)/rpng_test.c \
 	$(LIBRETRO_PNG_DIR)/rpng.c \
 	$(LIBRETRO_PNG_DIR)/rpng_encode.c \
+	$(LIBRETRO_COMM_DIR)/encodings/encoding_crc32.c \
+	$(LIBRETRO_COMM_DIR)/string/stdstring.c \
 	$(LIBRETRO_COMM_DIR)/compat/compat_strl.c \
 	$(LIBRETRO_COMM_DIR)/file/nbio/nbio_stdio.c \
 	$(LIBRETRO_COMM_DIR)/file/archive_file.c \
diff --git a/libretro-common/formats/png/test/rpng_test.c b/libretro-common/samples/formats/png/rpng_test.c
similarity index 100%
rename from libretro-common/formats/png/test/rpng_test.c
rename to libretro-common/samples/formats/png/rpng_test.c
diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk
index 118275c4d3..43b276803e 100644
--- a/pkg/android/phoenix/jni/Android.mk
+++ b/pkg/android/phoenix/jni/Android.mk
@@ -5,7 +5,7 @@ RARCH_DIR := ../../../..
 
 HAVE_NEON   := 1
 HAVE_LOGGER := 0
-HAVE_VULKAN := 1
+HAVE_VULKAN := 0
 
 INCFLAGS    :=
 DEFINES     :=