Merge "Back out TintResources changes DO NOT MERGE ANYWHERE" into mnc-ub-dev
am: 793b4d9  -s ours

* commit '793b4d910a7ece1d21f8c5b48b805b3e513507a9':
  Back out TintResources changes DO NOT MERGE ANYWHERE

Change-Id: I252ff7a3da143c40cce817b6be93d992f6713776