am aab9d9a7: (-s ours) am 1a434aa8: am 697c511d: am 80c668f2: Remove references to non-std Java classes. [DO NOT MERGE]

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