Merge pull request #398 from android/jakew/package-fix/2018-03-05

Correct package of File.toUri.
tree: c03321130be1eddb5946806d0c21236018792fd5
  1. core/