Merge "Add API generation to VDC + AVDC" into mnc-ub-dev