Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmallow-cts-dev
am: a5af1b076f

Change-Id: I01c65d693d7ad5befe9244cb0d24814750a80bd2