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

Change-Id: Ie2dccfaa406fbe9ed65599686d21e7ef785fbe5c