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: 013d6216a1

Change-Id: I0fba60fc91c5b69bb0a5ee4100366f712a992314