Fix qisrc rebase
Fix qisrc rebase

Change-Id: I8c63c84ab1c81231df5b8737a6397bebeb067a03

dmerejkowsky/qibuild,aldebaran/qibuild,dmerejkowsky/qibuild,aldebaran/qibuild,dmerejkowsky/qibuild,dmerejkowsky/qibuild,dmerejkowsky/qibuild,aldebaran/qibuild,aldebaran/qibuild