Merge "Surfaces ParcelFileDescriptor#parseMode() as API" into klp-dev