Merge "Remove old vndk logic" am: 560c50f6cd

Change-Id: Ic007f2e6f6c4a74f0f13eef18e83e983219b587b