We don't need this hack anymore
Merge branch 'google-flo' of https://github.com/Tk-Glitch/Glitch_Flo_AOSP into google-flo