Merge "Revert "Fix VFY warning for VDC and AVDC about calling the new API on old platform."" into mnc-ub-dev am: ade92f9dc7 am: 230a151827 am: 099436b7ab
am: 10a277003b

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