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

Change-Id: I03b04424e68878b046d5c63f45b9d4d23a791bb4