Merge "Delegate the VDC and AVDC to the framework version when above Lollipop" into mnc-ub-dev
am: 9dbc6d1e04

* commit '9dbc6d1e04eba4878d7f334dae208b870b4a63de':
  Delegate the VDC and AVDC to the framework version when above Lollipop