Merge "Richer ParcelFileDescriptor close events." into klp-dev