Merge "Add PLATFORM_VNDK_VERSION to the pattern of VNDK ABI dump paths"