Merge "vndk-snapshot: Make the remote name settable" am: 06c57d0ecf
am: 4ef90e79b8

Change-Id: I7ba26ad6fd223ac7c72cbf7e63fa78c155e14453