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

Change-Id: Ifb4364db7813402204cb666ae53acab76072ec16