Merge "Plumb the switch code into Dalvik." into jb-mr1-dev