Merge "Fix typo in cross partition dependency generation" am: 3de79b18 am: 4e983209

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



Change-Id: Ifbfe1fb17c1e7da40266a050af023197ff47bf68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>