am 936c7ed9: am 16a150b8: Merge "ART: Fix arm32 quick_invoke_stub CFI"

* commit '936c7ed92fd3ae6c6e478dd6999326d6e087b3bf':
  ART: Fix arm32 quick_invoke_stub CFI