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

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