[automerger] Fix type confusion in libpac am: cad79334 am: dfd6a6fa am: 67c9400d am: 8ae53d49 am: 358bd533 am: ac820973 am: 10c2d8b5 Change-Id: Ie293171d315c18cd325ebce76c21fc3e2d59df09