Merge "mark optional dependency to test/vts/tools/build/Android.host_config.mk" into oc-mr1-dev