Merge "Remove old Brillo code." am: f1041f736a
am: 96e1565ef7

Change-Id: I236f66b41f38bbff099b9bdc977b1314b891b3e9