Merge "ClipDescription no longer inherits from ClipData."