Merge "Fix typo in the output binary" into qt-dev am: aba76c4d48
am: 91eaf16f58

Change-Id: I2ffa57cd949051530c1e53b9c990154da5d49a4b