Merge "MediaCodec constants For Multiple access-units" into main