Merge "Both build 32 and 64 architecture for TetheringTests"