samsung: import changes on top of jb_mr1_chocolate

Change-Id: Icfd7c81d6961241f1a709de0988339947eaf5d98
Merge tag 'AU_LINUX_ANDROID_JB_1.9.6.04.03.00.143.058' into HEAD

AU_LINUX_ANDROID_JB_1.9.6.04.03.00.143.058 based on quic/aosp/jb_1.9.6

Change-Id: I2e11f8c301411741e3678a42c3230c132c2e900a