Get the arm32 changes under source control, only on a branch until they are
fixed to work properly.
Get the arm32 changes on a branch until they are fixed.
Merge changes from trunk.