Merge "Revert "Add integration test for testing the arch variant passed to cc modules included in APEXES.""