Merge "vndk-def: Fix template" am: f192bc8d50 am: 9725fc0b11
am: ba27a0c55c

Change-Id: Ib2310bb6081428715d6d23dc1911216079a5173c