Merge changes I73c88715,I26ef88df

* changes:
  IO error reporting in the last AssetManager func
  [res] Speed up AssetManager pointer locking