Merge "Camera2: Build both 32 and 64 bit test binaries"