Sync-back BUILD files

Change-Id: I93c987bb1a2e983530a56d26d8cedd300e25e30c
Various cleanup around the code base

Change-Id: I3cb498d8228f33508ba7b2b23c10a3f6aec3afb0