Merge "Revert "libsnapshot: compile tests for both 32 and 64 bit"" into main...

Merge "Revert "libsnapshot: compile tests for both 32 and 64 bit"" into main am: 9da55b8c am: 654bee33

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3212201



Change-Id: I77b9bb2fb3fd51f3e40ef1316999f2da462108cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>