[automerger skipped] Add components to enable CFI for.
am: d2c372c086
-s ours
Change-Id: I32c8628fddf01a4048e40c5e98032e135d83852a
This commit is contained in:
commit
78a5d7725c
am: d2c372c086
-s ours
Change-Id: I32c8628fddf01a4048e40c5e98032e135d83852a