Feature #4977: Revert submodules and correct Android.mk for cpp-tests