Merge "FdFile: fix operator=(FdFile&&)" am: 73b9f45998 am: abed8f3b01 am: 570f506796
am: 73356599a2

Change-Id: I7b0df20a9fa1b3370f464219ac15be8bfa4bdad6