Merge "Make the SupportDemo apps work the AppCompat + VDC" into mnc-ub-dev
am: 87d5e9b38c

* commit '87d5e9b38ca04823f49ba708c7d7531dc624fa70':
  Make the SupportDemo apps work the AppCompat + VDC