Code changes done for the apk generation