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

Change-Id: I5c5887467d464d33a4e81dd09468ecdf3379dec0