Merge "Merge "Changed local refs in JNI to ScopedLocalRef" into qt-dev am:...
Merge "Merge "Changed local refs in JNI to ScopedLocalRef" into qt-dev am: e32ae7e3" into qt-dev-plus-aosp
am: 4e558e8d
Change-Id: I0edf8b9655fd63cd786fe16d442f0c5197fd6364