Merge "VtsTrebleSysProp: modify invalid words _ODM_TYPEPREFIX to _ODM_TYPE_PREFIX" am: baa4d63a93

Change-Id: I9f9c51160bd426f312c8033b761003a3e8d34d4b