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

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



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