Merge "Add basic lsof command" into gingerbread