Merge "Mterp/arm: Add CFI directives."
am: 07830e11b7

Change-Id: Id7c086ac5383fa3cfbe1e32f7715327688c0b3cc