Merge "vndk-snapshot: add version suffix for v27 files" am: 1e287fa6d5
am: 1e96a1ef6c

Change-Id: I28a16bf2f36994c726dc7ed4e133ed89aa485895