Merge "vndk-def: Fix template"