Merge "Finish cleanup of CTS-V admin/tapjacking/UsbTest" into udc-dev