Merge "[incremental] parcelable for incfs file descriptors"
am: c8b066091e

Change-Id: Id9b7438ea32a1cc08e62791be4a1b9c566c30876