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

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