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

Change-Id: Ic7ca66d2e50830ec6c8cdee70d4b0a344a02ab99