[automerger skipped] Merge "Soong package structure refactoring" into rvc-dev am: 30167e8003
-s ours
am skip reason: Change-Id I7b00cd344b9f16861f1ff39edf0029f016b853d0 with SHA-1 4b79e98a6e
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11709657
Change-Id: If6182a6e025039c30cc7056d5e34f434000d3d68
This commit is contained in: