Merge "Do not kill apps dependending on static shared lib"