Merge android-msm-marlin-3.18-security-next into android-msm-marlin-3.18

No-op merge in order to fast-forward -security-next to match master.

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