[automerger skipped] Merge "Add components to enable CFI for." into pi-dev

am: 001bc1ee00  -s ours

Change-Id: Ie84c9c4af9850bf092d70db1663d2608899bb969
This commit is contained in:
Vishwath Mohan 2018-04-02 21:15:55 -07:00 committed by android-build-merger
commit 794915b4f7

Diff Content Not Available