(ARM) Fix build and clean up.
Merge pull request #6 from sergiobenrocha2/master

(ARM) Fix build and clean up.