Merge "Remove java.nio.file package" am: 804e1e8c15
am: 2a30579c2e

* commit '2a30579c2ec9b5aedc8f28f6ab1c6922eca428cc':
  Remove java.nio.file package