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

Change-Id: I11e1a99d8482871ac0c2fac0761f77d0a57f6938