Merge "Various fixes in bspatch and File class."
am: a1e8251cad

* commit 'a1e8251cad073f210d86a3e99b166b75409891fc':
  Various fixes in bspatch and File class.