Revert "Fixes from sample count change"

This reverts commit f3316224b95e4d3325972552df0d1c046ae73225.

Reason for revert: android vulkan build broken

Original change's description:
> Fixes from sample count change
> 
> Re blacklist imagination msaa on Vulkan and fix i->1 bug in GL
> 
> Bug: skia:
> Change-Id: I8045565b2064d2ee037ab43b167e6d5d3a59268e
> Reviewed-on: https://skia-review.googlesource.com/24780
> Reviewed-by: Cary Clark <caryclark@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>

TBR=egdaniel@google.com,bsalomon@google.com,caryclark@google.com

Change-Id: I076a4226f5725b3d48592402772ca39b64cae478
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/24840
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
3 files changed