Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev-plus-aosp

Manual merge to maintain topic for conflict.

* goog/mirror-aosp-master:
  Follow Soong changes to PathForSource behavior in tests

Bug: none
Test: manual
Change-Id: I5dd56ce9665e9c7cf9f634e6e100d9f3bdf22251