resolving cherry-pick conflict
update libpropeller