Merge "Fix bug #8335710 TextView can't clear CompoundDrawables" into jb-mr2-dev