Merge changes from merged-arm-thumb-backend-branch onto trunk.