Merge "Revert "Using Android R pdfium variant for pdfclient_test, since..."" into main