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