[trivial] ARM fixes up to 2.065

A unittest needs a new import in 2.065.

ping @ibuclaw