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

Merge "[automerger skipped] Merge "Maintain compatibility by deleting target directory before renaming into it." into rvc-dev am: 5c77ec2e am: 9481bbbf am: 7e73a667 -s ours" into rvc-qpr-dev-plus-aosp am: d4c62647 -s ours

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

Change-Id: I2b7a3208509141f6393907f30ccf3dcd1195e332