Merge "Build stubs against SDK and clear local variables"