Merge "Remove ParcelFileDescriptor.aidl"
am: c7c7fe6325

Change-Id: I508f7591ad990d774b7866a831ac84f7a8fb6f77