Merge "Revert "Revert "Fix VFY warning for VDC and AVDC about calling the new API on old platform.""" into mnc-ub-dev
am: a4b98c8006

* commit 'a4b98c80060206f3d0334ec634a28e208dbbf409':
  Revert "Revert "Fix VFY warning for VDC and AVDC about calling the new API on old platform.""