Merge "Temporary fix for ARMv7 -user builds."