Merge "Proper fix for issue 20051601 - arm actually means thumb2."