diff --git a/_studio/mfx_lib/Android.mk b/_studio/mfx_lib/Android.mk
index 162b2c8d6..923e9f7a4 100644
--- a/_studio/mfx_lib/Android.mk
+++ b/_studio/mfx_lib/Android.mk
@@ -295,7 +295,7 @@ LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32)
 
 LOCAL_LDFLAGS := $(MFX_LOCAL_LDFLAGS_HW)
 
-LOCAL_HEADER_LIBRARIES := libmfx_headers
+LOCAL_HEADER_LIBRARIES := libmfx_headers libva_headers
 LOCAL_WHOLE_STATIC_LIBRARIES := $(MFX_LOCAL_STATIC_LIBRARIES_HW)
 LOCAL_SHARED_LIBRARIES := libva
 
@@ -334,7 +334,7 @@ LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64)
 
 LOCAL_LDFLAGS := $(MFX_LOCAL_LDFLAGS_HW)
 
-LOCAL_HEADER_LIBRARIES := libmfx_headers
+LOCAL_HEADER_LIBRARIES := libmfx_headers libva_headers
 LOCAL_WHOLE_STATIC_LIBRARIES := $(MFX_LOCAL_STATIC_LIBRARIES_HW)
 LOCAL_SHARED_LIBRARIES := libva
 
diff --git a/_studio/shared/include/mfx_utils.h b/_studio/shared/include/mfx_utils.h
index 8394cc487..33bbfe261 100644
--- a/_studio/shared/include/mfx_utils.h
+++ b/_studio/shared/include/mfx_utils.h
@@ -131,7 +131,7 @@ template <class F>
 struct result_of;
 
 template <typename TRes, typename... TArgs>
-struct result_of<TRes(TArgs...)> : std::result_of<TRes(TArgs...)> {};
+struct result_of<TRes(TArgs...)> {};
 
 template <typename TRes, typename... TArgs>
 struct result_of<TRes(*const&)(TArgs...)>
diff --git a/android/mfx_defs.mk b/android/mfx_defs.mk
index fac4bcdd4..abfeae310 100644
--- a/android/mfx_defs.mk
+++ b/android/mfx_defs.mk
@@ -21,6 +21,9 @@ MEDIA_VERSION_ALL := $(MEDIA_VERSION).pre$(MEDIA_VERSION_EXTRA)
 MFX_CFLAGS += -DMEDIA_VERSION_STR=\"\\\"${MEDIA_VERSION_ALL}\\\"\"
 
 # Android version preference:
+ifneq ($(filter 15 15.% V% ,$(PLATFORM_VERSION)),)
+  MFX_ANDROID_VERSION:= MFX_V
+endif
 ifneq ($(filter 14 14.% U% ,$(PLATFORM_VERSION)),)
   MFX_ANDROID_VERSION:= MFX_U
 endif