Cherry-pick the following missing commits from nyc-mr1-dev prior to
authorXin Li <delphij@google.com>
Tue, 27 Dec 2016 22:48:38 +0000 (14:48 -0800)
committerXin Li <delphij@google.com>
Tue, 27 Dec 2016 22:56:22 +0000 (14:56 -0800)
b/33090058, which was lost as a result of merge
01c922fc267ea41cc1c6cb83cde7ba6da200dc38:

ea5589 Kenneth Graunke: Fix sample_mask_in.bit_count_per_two_samples
       tests for 2x MSAA.
d2f3b4 Kenneth Graunke: Fix internal format/type for 3D + depth/stencil
       negative API tests.
bf0076 Aaron Holden: Add runtime to CtsDeqpTestCases

BUG: 33090058
Change-Id: I88a47ddebd9dff35a3fa65967cca6fe21b739a6e


Trivial merge