Merge "VtsTrebleSysProp: modify invalid words _ODM_TYPEPREFIX to _ODM_TYPE_PREFIX"