Fix intdefs that were incorrectly defining "flag"

Fixes: 174238227
Test: docs only change, build success
Change-Id: I0f95aadd63ae315ffdf534e4579c4b8e64b94672
5 files changed