Merge "vndk-def: Use os.path.join() instead of '/'" am: 683e59ce11
am: 6a0b93ed7c

Change-Id: I49824cb03eabfdd397df44df9cb938d2e617364c