Merge "Move main function out of namespace" into qt-dev
am: 5927a9b1f1

Change-Id: I154b181595aa1bd08bacf5ea12b18d28143d4d0e