Merge "Generalize vts config module for other Suites" am: ef582f1432 am: 41c41c0215
am: b557270fde

Change-Id: I617016d4b88e315759c9d09f290c054386369fb4