Merge "Use REPLACE_EXISTING for rename(2) workaround." into rvc-dev am: 78243297 am: 384a8b91 am: d18c1bdf Change-Id: I18200bc7fa2db0db5e693269f35547c4b3241517