Merge "Emit some additional debug info for java.lang.String"
am: 55380bbe09

* commit '55380bbe098bace4375d77a2b77d05ef88dfe6f6':
  Emit some additional debug info for java.lang.String