Merge "Revert "Revert CUBE_COMPATIBLE flag check from "Fix required sample count...
authorPyry Haulos <phaulos@google.com>
Thu, 25 Aug 2016 16:13:33 +0000 (12:13 -0400)
committerGerrit Code Review <gerrit@gerrit.khronos.org>
Thu, 25 Aug 2016 16:13:33 +0000 (12:13 -0400)

Trivial merge