Merge changes I5bd5b55a,I4d8139ec

* changes:
  Support system.img modification for inter branch target
  Dereference symlinks when copying files.