Merge "Fixes for versioner guard generation" am: e98bf160eb am: a6a1edd4d9 am: cf50f36539 am: 173a51a4fe

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

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