Merge "Both build 32 and 64 architecture for TetheringTests" am: 736ed507d6 am: 6aca95071a am: a4ea319b72

Change-Id: I1b7c1a0ce9102af988b4ddb6ffd174d5800f7e5a