Merge "Merge "vndk-def: Use os.path.join() instead of '/'" am: 683e59ce11 am: 6a0b93ed7c" into oc-dev-plus-aosp
am: ed5e10d53b

Change-Id: If0719e0fa1ce818e6a70f9a48055d73e51b40e8a