Merge "Generation of C Flags Artifacts" am: 7a4bf49fb9 am: da558de483
am: b3d7c734aa

Change-Id: I0697639259d77ec382e9b802d0561decd964ff37