Merge "Improve flags for compliance tools." am: 10714789 am: 4033d647 am:...

Merge "Improve flags for compliance tools." am: 10714789 am: 4033d647 am: 1ac559c0 am: 8967bd63

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



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