Merge "Remove mirror::String::java_lang_String_." am: a3906d5eb4
am: af617b2856

Change-Id: I5771946b024162f6ebe054cc2d92099d08f71081