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

Change-Id: Idfcd1c96700716ce34ab615db4e7ae6410623af2