Merge "Allow empty modules.load file to be generated" am: ac296d5c am: 902eefd6

Original change: https://android-review.googlesource.com/c/platform/build/+/2325265



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