Merge "Remove obsolete brillo property"
am: 405a40c500

Change-Id: I08eaa6fb25818e19713e3a40b66b1b9824d732b0