Merge "Add Gradle support and tests in VDC and AVDC" into mnc-ub-dev