Merge changes Id0d167e6,I290a02b0

* changes:
  Clean LOCAL_RESOURCE_DIR paths
  Implement clean-path