Fix include order and relative paths for cpplint#551

jacobperron merged 2 commits intomasterros2/demos:masterfrom

jacob/update_cpplint_forkros2/demos:jacob/update_cpplint_forkCopy head branch name to clipboard