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

* aosp/upstream:
  Move unpackProperties to proptools and export it
  Add scoped module factories
  Move LoadHooks from Soong to Blueprint

Test: m checkbuild
Change-Id: I25ac946cdbe6c4faca167413c347f3de4be58024