Merge "Add name hint to blueprint." am: aefc0a9b9b am: b72e38080e am: bedb263bc4 am: 85934ee063

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

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