Merge "Update ToolingCFlags overrides to include other new architectures" am: 8eb8704c am: 86b2b317 am: 3d5ee11e Change-Id: Ifaa35db08d35ed3cb14fce3e9c5643f26bc3f706