Merge "Remove old vndk logic" am: 560c50f6cd am: f8ca862c09 am: 464cf23382

Change-Id: I80bf09199848cc799bd891b8840379334441322d