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

Change-Id: Ie650bbb9379722770f4031f58bab68bc37b450b7