Merge pull request #822 from Innoseis/options_subfolder

Reorders protoc include path passed by FindNanopb.cmake so that proto file hierarchy is preserved.