Merge "Remove clearkey hidl code"