Merge "Remove java.nio.file package"
am: af40563ea3

* commit 'af40563ea3a8bc05242a0685b653166bd450f43b':
  Remove java.nio.file package