Merge "Use the non-APEX version for C++ API for libpac unittest"