Remove dependency on r11 of the support-v4 compatbility library.