[DF-185] fix android project
Merge branch 're_stable' into development
Merge branch 'development' of https://github.com/dava/dava.framework into development
Merge branch 'development' into frame_stats