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: I79ac475d83e45fac68e8584fdba6916ca4bf3a16