Merge "Update test dependencies in AppCompat + design" into mnc-ub-dev