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

Change-Id: I31a0bc275e0b379119f1dafe39f524d738b96321