Merge "Remove dependency on libparcelfiledescriptor"
am: cac8b13023

Change-Id: I35c751c8ecd2188711fd578de7a1367c1f7945b8