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

Change-Id: I7df9227c4a563cd476419149f148e282ac29305a