Rename instrumentTest directory to test, as is expected by junit.
update submodule