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

Change-Id: Iecca867f0ba62b3026bcc5af3ffd9ff16ace65e9