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

Change-Id: I565288462fed11e2a3416e88da75d23a628b4318