Updated MPfm.GenericControl project files after major changes in the last commit. Updated Android project after changes.