Merge "Remove dependency on libparcelfiledescriptor" am: cac8b13023
am: 1a5e1ddadc

Change-Id: Ibc4b4994c14b47decea5e74267e276080498901e