diff --git a/configure.ac b/configure.ac
index 9d21a8d7..ccbf99aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ m4_define([va_api_version],
 m4_define([libva_major_version], [m4_eval(va_api_major_version + 1)])
 m4_define([libva_minor_version], [m4_eval(va_api_minor_version)])
 m4_define([libva_micro_version], [0])
-m4_define([libva_pre_version],   [1])
+m4_define([libva_pre_version],   [0])
 
 m4_define([libva_version],
           [libva_major_version.libva_minor_version.libva_micro_version])
diff --git a/meson.build b/meson.build
index 36280b84..b96408b1 100644
--- a/meson.build
+++ b/meson.build
@@ -7,7 +7,7 @@
 # - reset micro version to zero when VA-API major or minor version is changed
 project(
   'libva', 'c',
-  version : '2.17.0.1',
+  version : '2.17.0',
   meson_version : '>= 0.53.0',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized' ])
diff --git a/va/Android.mk b/va/Android.mk
index 050c3778..19e78c40 100644
--- a/va/Android.mk
+++ b/va/Android.mk
@@ -25,8 +25,8 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-LIBVA_DRIVERS_PATH_32 := /vendor/lib/dri
-LIBVA_DRIVERS_PATH_64 := /vendor/lib64/dri
+LIBVA_DRIVERS_PATH_32 := /vendor/lib
+LIBVA_DRIVERS_PATH_64 := /vendor/lib64
 
 include $(CLEAR_VARS)
 
@@ -41,7 +41,10 @@ IGNORED_WARNNING = \
 LOCAL_SRC_FILES := \
 	va.c \
 	va_trace.c \
-	va_str.c
+ 	va_str.c \
+    	drm/va_drm.c \
+    	drm/va_drm_auth.c \
+    	drm/va_drm_utils.c
 
 LOCAL_CFLAGS_32 += \
 	-DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH_32)\"" \
@@ -52,16 +55,56 @@ LOCAL_CFLAGS_64 += \
 LOCAL_CFLAGS := \
 	$(IGNORED_WARNNING) \
 	$(if $(filter user,$(TARGET_BUILD_VARIANT)),,-DENABLE_VA_MESSAGING) \
-	-DLOG_TAG=\"libva\"
+	-DLOG_TAG=\"libva\" \
+	-DSYSCONFDIR='"$(sysconfdir)"'
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
 
+LOCAL_COPY_HEADERS := \
+     va.h \
+     va_android.h \
+     va_version.h \
+     va_dec_hevc.h \
+     va_dec_jpeg.h \
+     va_dec_vp8.h \
+     va_dec_vp9.h \
+     va_enc_hevc.h \
+     va_enc_h264.h \
+     va_enc_jpeg.h \
+     va_enc_vp8.h \
+     va_enc_av1.h \
+     va_backend.h \
+     va_drmcommon.h \
+     va_vpp.h \
+     va_backend_prot.h \
+     va_backend_vpp.h \
+     va_enc_mpeg2.h \
+     sysdeps.h \
+     va_compat.h \
+     va_egl.h \
+     va_prot.h \
+     va_enc_vp9.h \
+     va_fei.h \
+     va_fei_h264.h \
+     va_fei_hevc.h \
+     va_internal.h \
+     va_str.h \
+     va_tpi.h \
+     va_trace.h \
+     va_dec_av1.h \
+     drm/va_drm.h
+
+LOCAL_COPY_HEADERS_TO := libva/va
+
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libva
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_PROPRIETARY_MODULE := true
 
 LOCAL_SHARED_LIBRARIES := libdl libdrm libcutils liblog
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0)
+LOCAL_HEADER_LIBRARIES += libutils_headers
+endif
 
 intermediates := $(call local-generated-sources-dir)
 
@@ -69,13 +112,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \
 	$(intermediates) \
 	$(LOCAL_C_INCLUDES)
 
-GEN := $(intermediates)/va/va_version.h
-$(GEN): SCRIPT := $(LOCAL_PATH)/../build/gen_version.sh
-$(GEN): PRIVATE_CUSTOM_TOOL = sh $(SCRIPT) $(<D)/.. $< > $@
-$(GEN): $(intermediates)/va/%.h : $(LOCAL_PATH)/%.h.in $(LOCAL_PATH)/../configure.ac
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN) 
-
 include $(BUILD_SHARED_LIBRARY)
 
 # For libva-android
@@ -94,10 +130,17 @@ LOCAL_CFLAGS += \
 LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/drm
 
+LOCAL_COPY_HEADERS_TO := libva/va
+
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libva-android
 LOCAL_PROPRIETARY_MODULE := true
 
 LOCAL_SHARED_LIBRARIES := libva libdrm liblog
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0)
+LOCAL_STATIC_LIBRARIES += libarect
+LOCAL_HEADER_LIBRARIES += libnativebase_headers libutils_headers
+endif
+
 include $(BUILD_SHARED_LIBRARY)