am 25931ade: Merge "Clean up drawable theming APIs" into lmp-preview-dev

* commit '25931adee5ba954220190f48901bb66c8c9dd462':
  Clean up drawable theming APIs