Merge "Fix DrawableCompatTest" into mnc-ub-dev
am: 0c4ab17c5e

* commit '0c4ab17c5e0f416f1ecda97c655ca3df0832c4e3':
  Fix DrawableCompatTest