Merge RootFlow into BlockFlow
Merge pull request #436 from sfowler/remove-rootflow

Merge RootFlow into BlockFlow
submodule: add android required modules
submodule: change to local development branch