Merge "Revert "vts_treble_vintf_test: fix test error message."" into pi-dev