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

Change-Id: Ib0f7ade6782184dcf5aaa9fa29bd9856d9168d54