Merge "FdFile: fix operator=(FdFile&&)" am: 73b9f45998
am: abed8f3b01

Change-Id: Iaf2a3e875ac0396d2c40987d0b384574f0a94a41