am 15c9881c: Merge "ART: Fix arm32 assembly stub CFI"

* commit '15c9881c7c480d0131099e436cff2f13ba50e5e3':
  ART: Fix arm32 assembly stub CFI