Merge "Remove clearkey hidl code" into udc-dev