Merge "Drop obsolete --add-exports argument for vm-tests-tf."
am: bec049bb49

Change-Id: Ib33c80ff94f11f9c8137c6a9d5304bc305825fac