Merge "ART: Fix OOME case in proxy dispatch"
am: 42530a8a77

Change-Id: Idac27c6c6d054051723c8cf128d7ec648dadb738