Merge "Remove dependency on libparcelfiledescriptor"