rollback changes from release preparation of AndroidHybrid