Merge "Fix typo in the output binary" into qt-dev am: aba76c4d48 am: 5691556762
am: c653f03e80

Change-Id: I709e808178f61495db19610d5c36db81db3cb05c