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

Change-Id: I1c2c6f40b9bf0c05f3640538ed58f4a5f9c0e5c3