Merge android-msm-marlin-3.18-pi into -pi-qpr1

Change-Id: I6005ebfeded814ddc10bfc35b5b6e408c21628ab
Signed-off-by: Petri Gynther <pgynther@google.com>