Remove duplicated variables and unify the startup data into a new (inherited) struct.
Update Android.mk Remove 'src/client' from include_directories