ARM fixes

Trying to get the delta between master and android smaller