Merge "Fixes for versioner guard generation" am: e98bf160eb am: a6a1edd4d9

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

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