Merge "Add a workaround for VectorDrawable issues on API 21" into mnc-ub-dev
am: 41ef2bdbd6

* commit '41ef2bdbd69e2ba137dd97bd9ec3370f2817b22a':
  Add a workaround for VectorDrawable issues on API 21