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