[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: 9481bbbf am: b58b3897 am: 7465a926 -s ours

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

Change-Id: Ia1ae3670385e153cd1a8a260d9a0561bbc6e0848