omni: Add merge --squash into merge script

Change-Id: I42718264f644a3071b45ae1467168929ebc2c9c4
2 files changed