Merge "Set multilib to all snapshots except header" am: 57a9db7c48 am: 11d164b864

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

Change-Id: Ie15de7a7e36583d944db75745fa85adf209127a0