Merge "Add PLATFORM_VNDK_VERSION to the pattern of VNDK ABI dump paths" am: f45e8c672a am: d84fef6d46
am: 0c05e6c44a

Change-Id: Iaddf955b61b86b0e269ba4738529bb88d57588b0