Android: sync up latest JNI generator changes from downstream.

base/android/jni_generator/sample_for_tests.cc

Index: base/android/jni_generator/sample_for_tests.cc
diff --git a/base/android/jni_generator/sample_for_tests.cc b/base/android/jni_generator/sample_for_tests.cc
index 30b994063505b94c854a15153f9d1262198c5a8b..24190c62a6212ce5a130a6a37ed33962bdf33bbe 100644
--- a/base/android/jni_generator/sample_for_tests.cc
+++ b/base/android/jni_generator/sample_for_tests.cc
@@ -51,6 +51,13 @@ void CPPClass::IterateAndDoSomethingWithStructB(JNIEnv* env, jobject obj) {
   map_.clear();
 }
 
+base::android::ScopedJavaLocalRef<jstring> CPPClass::ReturnAString(
+    JNIEnv* env, jobject obj) {
+  base::android::ScopedJavaLocalRef<jstring> ret = ConvertUTF8ToJavaString(
+      env, "test");
+  return ret;
+}
+
 // Static free functions declared and called directly from java.
 static jint Init(JNIEnv* env, jobject obj, jstring param) {
   return 0;