Fix pkg and libaacplus merges