Merge "Revert "Make TintResources inherit from ResourcesWrapper"" into mnc-ub-dev
am: 4c022451f1

* commit '4c022451f18cc1a06f0d070da60814357ffa5902':
  Revert "Make TintResources inherit from ResourcesWrapper"