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

Change-Id: I9443532f8abbb2f5420be84682d600ff5888c2e4