Merge "Make the SupportDemo apps work the AppCompat + VDC" into mnc-ub-dev