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

Change-Id: I8f5f26cec3acac035b289aa69401fb3d0810c048