Revert "Revert "revert changes to arch/arm/lib""

This reverts commit 75fef1c68ade23a3e453a8d1021405e5277a6b67.