am b33c48b4: am 906d1caa: Merge "Clarify the String.compareTo contract and add tests."

* commit 'b33c48b4228c2bf3bd3ffbb7e80122b3f6dff928':
  Clarify the String.compareTo contract and add tests.