[automerger skipped] Add cfi instructions.
am: bc8e130bcb -s ours
am skip reason: change_id Ie213615bebe8dd3a091c4ddef561f2a609b8c4ec with SHA1 51c655847f is in history

Change-Id: I24435557b65910b64f00e798be93c215e7365cc3