Bug: http://b/162109763 Test: treehugger Change-Id: Id392d0d87dd6ba098382436062b90e3a5ed79025
Rearrange some files while we're doing this. Bug: http://b/71721338 Test: manually ran adb on windows Change-Id: Ie47bda82279e4b9521505ad0353bf9ef649fc7d7