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

Change-Id: I8ee7c8ae5e66ceb7a9f12e8def48ebdd1dedaa18