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

Change-Id: I19ee752d0b780635a8e392e7d02b2ddea2f7a1ab