Remove old submodules
Update submodules
Android studio 1.0 compatibility
Update submodules