Merge "Use packagepath and local_repository for mixed builds" am: 2bb2017a30

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

Change-Id: I6d83fab2fbaf824e509fc0c4acb3984ecddb8610