some improvements for android files generation