am 3a47dee2: am cb821758: Merge "Build fix: Remove reference to deleted java_io_Console function"

* commit '3a47dee23bc298f8814089b9590e59c46ad6b347':
  Build fix: Remove reference to deleted java_io_Console function