Merge "Remove unused compiler templates for armv7-a*"