Merge "RootCanal: use classes in bluetooth hci namespace" am: c020da6e80
am: a07d358210

Change-Id: I7f3f01c48740fe8223aa23ba87a7b52e86618fd4