vndk-def: Code cleanup: Remove duplicated code
am: 44169cbcbd  -s ours

Change-Id: I1b832d8ddaf6dc21ab61159f59957b5b8b74334e