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

Change-Id: Ifa6599b15cdc7e8558f9bbd28e6b16bc2bd059fb