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