rearrange some stuff
Merge branch 'wx44' of https://github.com/WeaponX1/android into wx44
fix up tree