Merge "vndk-snapshot: Make the remote name settable"