Merge "CP: Fix geometry shader support check" into nougat-cts-dev am: 54d4c9f476...