Merge "Integrate AVDC into AppCompat" into mnc-ub-dev