Merge "Fix printing variables that have inherit references in them" am:...

Merge "Fix printing variables that have inherit references in them" am: 9a92b27c am: 6b95d06a am: 57eafaa6

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



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