Merge "Remove bazel_module.label from bionic genrules" am: eb33b5b7a8 am: 2a2bebb557

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

Change-Id: Ifd6be887a82a401ce1e771db589e17e2bf3376c8