Merge "Check static field initial value types match in dex file verifier." into oc-dev