Merge "Support proc macros from metadata too." into main am: a68af6adc8

Original change: https://android-review.googlesource.com/c/platform/development/+/2799377

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