Various cleanup around the code base

Change-Id: I3cb498d8228f33508ba7b2b23c10a3f6aec3afb0
(cherry picked from commit 51efd1dee50d9e5e8acb77daf93cf5bbd2f78ee2)
Sync-back BUILD files

Change-Id: I93c987bb1a2e983530a56d26d8cedd300e25e30c
(cherry picked from commit 77525aa314cf1703424e1ca1c3521021a9f11622)