Update for 4.3.1_r1 JLS36I

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