Merge change I362bebd3 into eclair-mr2

* changes:
  Include the common source files directly in the framework library when building, to allow mutual interdependencies; the common static library will be built independently.