Merge "Specify to build against test_current SDK for a few UI toolkit test targets."