Merge "libs.mk: don't include x86inc.asm in codec src list"