Merge "MediaCodec: expose # of input slots in block model" into main