Create templates for primitive types.

In preparation to move static fields into their own array
members off of class.

Change-Id: Ic524e12952af985d8ae16a05b5f4e50676a9c136
diff --git a/src/class_linker.cc b/src/class_linker.cc
index e1dcbf8..89c96b4 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -464,7 +464,7 @@
                             Field* dst) {
   const DexFile::FieldId& field_id = dex_file.GetFieldId(src.field_idx_);
   dst->klass_ = klass;
-  dst->java_name_ = ResolveString(klass, field_id.name_idx_, dex_file);
+  dst->name_ = ResolveString(klass, field_id.name_idx_, dex_file);
   dst->descriptor_.set(dex_file.dexStringByTypeIdx(field_id.type_idx_));
   dst->access_flags_ = src.access_flags_;
 }
@@ -475,7 +475,7 @@
                              Method* dst) {
   const DexFile::MethodId& method_id = dex_file.GetMethodId(src.method_idx_);
   dst->klass_ = klass;
-  dst->java_name_ = ResolveString(klass, method_id.name_idx_, dex_file);
+  dst->name_ = ResolveString(klass, method_id.name_idx_, dex_file);
   {
     int32_t utf16_length;
     scoped_ptr<char> utf8(dex_file.CreateMethodDescriptor(method_id.proto_idx_,