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

Change-Id: I8253c01f44bf30bf66ac3c7cc5805931a45e4f00