Merge "Restore public __aeabi symbols"
am: 1155883bdd

* commit '1155883bdd36d7f258353cbb8e8a43034ae2bc95':
  Restore public __aeabi symbols