Merge remote-tracking branch 'aosp/upstream' into master

* aosp/upstream:
  Extract module naming into an interface

Bug: 65683273
Test: build/soong/scripts/diff_build_graphs.sh \
      --products=aosp_arm \
      'build/blueprint:work^ build/soong:work^' \
      'build/blueprint:work build/soong:work'
      # and see that the only changes were:
      # 1. adding some new files
      # 2. changing some line numbers
Test: m -j nothing # which runs unit tests

Change-Id: I2a2f958579fc6f96fad0eb06a5f98c93b80459b3