Include files from webrtc/.. paths in tools/

BUG=1662
R=kjellander@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1547004

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4166 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/tools/simple_command_line_parser.h b/tools/simple_command_line_parser.h
index 3ccfb0c..f791fe9 100644
--- a/tools/simple_command_line_parser.h
+++ b/tools/simple_command_line_parser.h
@@ -11,12 +11,12 @@
 #ifndef WEBRTC_TOOLS_SIMPLE_COMMAND_LINE_PARSER_H_
 #define WEBRTC_TOOLS_SIMPLE_COMMAND_LINE_PARSER_H_
 
-#include <string>
 #include <map>
+#include <string>
 #include <vector>
 
-#include "system_wrappers/interface/constructor_magic.h"
-#include "test/testsupport/gtest_prod_util.h"
+#include "webrtc/system_wrappers/interface/constructor_magic.h"
+#include "webrtc/test/testsupport/gtest_prod_util.h"
 
 // This is a very basic command line parsing class. We pass the command line
 // arguments and their number and the class forms a vector out of these. Than we