Manage keystore in custom_rules.xml instead of ant.properties
Merge conflicts
Add keystore properties
Merge remote-tracking branch 'origin/master'