Merge "Add missing CFI directives to ARM Quick entrypoints." am: f6a122c2cd
am: 0857194d0f

Change-Id: Ie1bea3d162be29af239956f9d7cdf73e397697ce