Merge "Revert "Add support for setTint in all Drawables, clean up lint warnings""