Merge branch \'nyc-dev\' of...

Merge branch \'nyc-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into nyc-dev
am: c80af9d2

* commit 'c80af9d2':
  Remove java.nio.channels.* classes without test coverage.