Merge "include: target: remove macros for old vb runtime naming convention."