Merge "Refactor vts_treble_vintf_test" into pi-dev
am: 93d43a2ecf

Change-Id: I592e9f223799c18e03bd498c8cbadcec6149c8df