Reverting wrong merges.
Revert "JB SAMMY LATIN SOURCE: arch/arm/ updates/cleanups"

This reverts commit be7599fdc61b8f00f7acd87863241bd87a73ef94.