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