Variant directory
android variant conf - variant dir kept in ameba.properties
Merge branch 'dev' into feature/autodetect_configuration