Merge "vndk-def: Remove more unused code" am: e857fab89a am: 6f33d58632
am: 1c03d34e0a

Change-Id: If7b6ede23eecf08f5f97424159d13aef473554b5