Merge "Remove CFI-related WAR that is no longer necessary"
am: 76ceec724f

Change-Id: I17c0d41482c78bc7ae0fb762d30e82d7a13e0091