Readded nativehelper

Change-Id: I62f0c298301fd5cfb90511ee8b091216da8d6497