Merge "Use REPLACE_EXISTING for rename(2) workaround." into rvc-dev am: 78243297 am: 88214048 am: a6908bbb am: 2a8a2a14 Change-Id: Icbb82b85cf131ab0e77f0012c5de34d47688dd10