Merge changes Iadb9dd81,I949decde

* changes:
  Enable BCJ fiter support in xz-embedded.
  Include missing files from xz-embedded-20130513.