Conflicts:
	va/android/va_android.c
	va/va_android.h
	va/va_backend.h
Signed-off-by: Austin Yuan <shengquan.yuan@gmail.com>