Update for weekly 8.18

Change-Id: I64f4e4cc1e395823b9245fdf9244503b9918e16f
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Bump to 8.20 for weekly

Change-Id: I99bfb9c9ca8bf07a2e0483a8634889e8b2ddea65
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Merge remote-tracking branch 'upstream/kk4.4' into kk4.4-mo4