Merge "Visualizer: fix native crash when visualizer release" am: bfb6086f67 am: 5959f23ac3
am: 3acc216ca8

Change-Id: Ia4660a1d16dd6157977774c3edcd71eb2709d5fa