Merge "Better buffer status management and verification in OMXCodec."