Merge "Try to fix LocalUnwinderTest.unwind_after_dlopen in APCT."
am: 063183f203

Change-Id: If21b1035a75c2403d6b1a199a30984cc2dcf8132