Merge "Add missing accessor to CompoundDrawable, clean up javadoc"