am 27c91491: am 8c54c861: (-s ours) am 2fee69e0: am 071206b4: am aab9d9a7: (-s ours) am 1a434aa8: am 697c511d: am 80c668f2: Remove references to non-std Java classes. [DO NOT MERGE]

* commit '27c91491490004494fb7c2f5125a98cb7b6518e9':
  Remove references to non-std Java classes. [DO NOT MERGE]