Merge "adds preload for armv6 encoder asm"