More work cleaning up the BUILD files

Change-Id: I47fb18e7a12cd7e081631a5369274ef1e25f22c4
32 files changed