Merge "Fix TextView#setTextCursorDrawable for resid=0"