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

Change-Id: I2573edd97419a85bb4feb9f9d89ab294427da003