Update for weekly 8.16

Change-Id: I489abb61204f2ef74f57631924dca5bfaed2f420
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Update for weekly 8.18

Change-Id: I64f4e4cc1e395823b9245fdf9244503b9918e16f
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>