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 '2fee69e0ad2e564365c5bace1e00bf6af4424b1c':
  Remove references to non-std Java classes. [DO NOT MERGE]