Merge "Mterp/arm64: Add CFI directives."
am: 4e1a19b2e2

Change-Id: Ic153b79632b1a7304a220b9a248f1def324a9d16