[automerger skipped] Merge "Remove CFI diagnostics mode" into rvc-dev am:...
[automerger skipped] Merge "Remove CFI diagnostics mode" into rvc-dev am: ea27109c am: 671f62c5 -s ours
am skip reason: Change-Id I4403da7c2b893907ca48918142c98bb6211656e6 with SHA-1 344164a0 is in history
Change-Id: I88f154283c774604353c029825050a4034fec2c6