Merge "Nativehelper: Fix ScopedLocalRef" am: 7afb45427e am: 727c2c03c8 am: 2f1df33912
am: 11be1ee1cf

Change-Id: I434f3c6f9d01c25982ab6563ddf4ff6ac1a31bf7