fix derp
Merge branch 'kk44' of github.com:BS-Harmony-S4/android into kk44