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

Change-Id: I6305a1d272be956927e78c5b5135201fce741a88