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

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

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