remove patches for vold switchable

Change-Id: Icf9d79f7d9b3138254dab1e1b9d2b35e3c526421