Merge "media.c2 aidl: provide a waitable fd for blockpool creation" into main