fix merge failures. From: Pekka Nikander <pekka.nikander@nomadiclab.com>
fix merge failures.
From: Pekka Nikander <pekka.nikander@nomadiclab.com>

need to improve buildlab scripts...

MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame,MarginC/kame