Improved constant usage in Apk.java and X509V3Certificates.java