Merge change I4dcec84d into donut

* changes:
  Update the build rules and project template to match the ones in eclair (do not merge)