Merge branch 'android-msm-marlin-3.18-ndr-factoryrom-security-next' into android-msm-marlin-3.18-ndr-factoryrom

November 2016.1