Merge "vndk-def: Use os.path.join() instead of '/'"
am: 683e59ce11

Change-Id: I9b06b3395a6864cde023ff56791bbbd82bc950be