Merge "Fixes for versioner guard generation" am: e98bf160eb

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2595561

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