Clean up tuner constants and update according to ag/9977359

and more minor cleanups

Test: make;
Change-Id: Iaa45289edf53a0c9ec48048e0c6f1cb6caad1bd6
25 files changed