Merge "Use (D)CHECK_ALIGNED more."