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

Change-Id: Ifdad078ceab7a948629e5d6d8c4cca15da796359