Merge "vndk-snapshot: add version suffix for v27 files"