Merge "Remove libcodec2_vndk from vndk" into qt-dev