Merge "proxy: Fix crash when creating proxies with dx-built libcore."
am: 977c510471

Change-Id: Ie84c019629a20500f8dd73934c758a6bc40042d3