am 3195ff0a: (-s ours) am b90db3e6: am de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]

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