Makefile change to allow VTS testing am: b9f27bbdad am: a15aee3613

Change-Id: I4c9fe15e18edc7742cef83ef8959efc8d918c7f7