Merge "puffin: Fix .pc files"
am: f0bad1d003

Change-Id: I500666a925580f030a970f98db6bb24926bfe201