fix apo-pci.c compile errors
remove apo-pci.c and apo-pci.h (conflicted method names)
Merge origin/master