Merge "veyron/services/store/memstore/query: Implement the "hidden" keyword."
diff --git a/lib/bluetooth/fd.go b/lib/bluetooth/fd.go
index 54766f3..328c351 100644
--- a/lib/bluetooth/fd.go
+++ b/lib/bluetooth/fd.go
@@ -1,3 +1,5 @@
+// +build linux
+
package bluetooth
// #include <stddef.h>
diff --git a/runtimes/google/ipc/stream/crypto/crypto_test.go b/runtimes/google/ipc/stream/crypto/crypto_test.go
index 4bbdd45..8720ccc 100644
--- a/runtimes/google/ipc/stream/crypto/crypto_test.go
+++ b/runtimes/google/ipc/stream/crypto/crypto_test.go
@@ -175,7 +175,7 @@
if _, err := rand.Read(plaintext); err != nil {
b.Fatal(err)
}
- e, d := tlsCrypters(b)
+ e, d := crypters(b)
b.SetBytes(int64(size))
b.ResetTimer()
for i := 0; i < b.N; i++ {
