Merge "ART: Fix null dereference for JSR45" into oc-dev