Revert "Build fixes for Brightness Controls (2/2)"

This reverts commit 49d6f6cdbcd9c3fe89a0c830c3838851e171a717.
Revert "Merge remote-tracking branch 'upstream/jellybean-legacy' into jellybean-legacy"

This reverts commit 218c9b71ca9c8717cbf11559c6f94eb793b295b0, reversing
changes made to ff5d471b6e1a06ae3a3e4724bca39e89aa2e6101.