Merge "Assign compile_multilib for executable snapshots" am: 4bc7559bb7 am: c67119dda5

Original change: https://android-review.googlesource.com/c/platform/development/+/1330893

Change-Id: I4f5cff4475092e2f5ac5df3440f19fa3ce1b53fb