Merge "Revert "Revert AppCompat's use of VDC" for v24 preview #2" into nyc-dev