Merge "Remove unused brightness control from HardwareComposer" into pi-dev am: 9a34c1a968
am: da9a0b58e5

Change-Id: I799642677fc3206ae3fec883bc5769d85fe96dc4