Merge "Merge "codec2: fix rare native crash in buffer queue thread" into qt-dev am: d0fb5dc7a1 am: ce5ea119f9" into qt-r1-dev-plus-aosp
am: b55b36fb51

Change-Id: I0ec901bc30144948eb0d3144027194613db17587