update Vold Switchable Pair patch

Change-Id: I29016f9ba43df2a0a5fc5c5f000e702c842c64f9