Merge "Make frame size dependent on arch-specific constants."