Merge "ART: Fix null dereference for JSR45"
am: e6cf6204ef

Change-Id: I3e56639a385bb79c3ad4b3a1acd31c8f42caef9f