Merge marking of libfaac as non-free from trunk.