Merge "Changed local refs in JNI to ScopedLocalRef" into qt-dev
am: e32ae7e304

Change-Id: I029521c0c97c2aa28b02986bdf431c817be741f8