Merge "Change MSAA sample-count error to warning" into marshmallow-cts-dev
am: 0727d29796

* commit '0727d29796e35bbeb403cac3939ddedc5cd877f5':
  Change MSAA sample-count error to warning