Merge "Update test dependencies in AppCompat + design" into mnc-ub-dev
am: 3872d0b805

* commit '3872d0b8057dd14c8308bde9f15d3086a0d0d89c':
  Update test dependencies in AppCompat + design