Merge "Update vts test module bp files to use VtsHalTargetTestDefaults"