Merge "Move drawRoundRect back to max-sdk-o greylist."