[automerger skipped] Merge "Maintain compatibility by deleting target...

[automerger skipped] Merge "Maintain compatibility by deleting target directory before renaming into it." into rvc-dev am: 5c77ec2e am: 1a98904a -s ours am: 90753b82 -s ours am: 4ff4f624 -s ours

am skip reason: Change-Id I11a80cd4252128b025912b7aab86b113935e549a with SHA-1 cf2ee87f is in history

Change-Id: I6dd8143c5e5676f44ce21d626064f2268d991d32