Fix VariantBuilder.php library prefix condition, and .gitignore list

* VariantBuilder.php
    - change library prefix condition order, because it always return `i386-linux-gnu` no matter x86 or x64 OS.

* .gitignore
    - remove git merge diff header, and add composer.lock.