Consolidate header files of flag mappings

Change-Id: I1f6f4904d1ce91ecb500e788988f78fa2e9634e6
Merge "Consolidate header files of flag mappings"