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

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