Merge "Mark mediacodec_2{6,7,8} as hal_omx_server"