Sync Glitch r2xx with android-msm-flo-3.4-lollipop-release

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