Merge "Make hwbinder stubs use a filegroup for srcs"