Merge "vndk-def: Update template makefile"