Mockup android, mvn, skin and other cleanings.
Merge pull request #717 from RotaruDan/mockup_android_cleaning

Mockup android cleaning