LTS: Merge 3.18.136 into android-msm-marlin-3.18

Update Marlin master kernel to 3.18.136 LTS kernel.

Bug: 115649896
Test: Manual testing
Change-Id: Id12322dfdfd434b04a5424fcee2f559cb84455a3
Signed-off-by: Petri Gynther <pgynther@google.com>