Merge "Fix the ordering of CREATE_SAMPLER macro in C++ API, according to corresponding Java API."