Merge "Add tintable icon support" into oc-dr1-dev am: 53d79aa8ea
am: 2e7d53964d

Change-Id: Ic7cc8a0f4e6f2590ebe46dd337bd03ca4a5d51a1