Refactor VTI tests to support null encryption
am: 91b562615b

Change-Id: Ibd1f11362637c884a6b3ba7188362252d5d30d05