Move nested classes out of Tuner.java

Test: make
Change-Id: If5bf7c5d38b527a2cc0c19d25c3bbb30e8b1a7e8
5 files changed