Merge "Remove old vndk logic"