[Android] Android.mk fixes after adding GUI test.
[Linux] Updating Makefile for TestCpp.
Removing unused files. Old XXXDispatcher.
Fixing wrong include.
[Android] ArmatureTest compilation fix.
Merge pull request #3640 from dumganhar/makefile-fixes

Makefile fixes