Merge "DO NOT MERGE remove HIDL vts files" am: e5aed731ab  -s ours
am: 9c7a61e136  -s ours

Change-Id: I0fc4a0b30e5dba4e6d5caa9c23df6d8105f0fa09