Merge "ParcelFileDescriptor is movable"
am: 7004211755

Change-Id: Icf505d751b7dc0e009f908fadfd7cfcb19b1736f