Merge "Remove CFI-related WAR that is no longer necessary"