Fixed some inconsistencies in pkg-config files

Change-Id: I57897609b9bbc558db01c237d3e24d78aa25a5ca