Merge "Nativehelper: Fix ScopedLocalRef" am: 7afb45427e
am: 727c2c03c8

Change-Id: I60a362684c5b44d59ed4c04cf37b2aa40b3b1a9e