Sync with Glitch_Flo_CAF since -glitched- commit. It did need fixes and adapations for AOSP base.

Signed-off-by: Tk-Glitch <Ti3noU@gmail.com>