Don't use keystore and upgrade support library