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

Change-Id: Idd4c4a8758b45c29c213b61b6f2f28d2bc4c1a1d