Merge "Restore public __aeabi symbols" am: 1155883bdd
am: 0adcdabb4a

* commit '0adcdabb4a9633de97c8115fe9950f279a1b87b9':
  Restore public __aeabi symbols