Merge "Nativehelper: Fix ScopedLocalRef"
am: 7afb45427e

Change-Id: Id2f4f62d4dbc31453819b5c13863d1b299566fa9