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

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

Change-Id: If52471ae9a56d66d55d1ae9b72921563773f3ed0