Merge "Remove ParcelFileDescriptor.aidl" am: c7c7fe6325
am: 21f4e04f3d

Change-Id: Ibd87a9a61ae70779baa90ced2eaab5526d4d815d