Merge "[incremental] parcelable for incfs file descriptors"