Android 6.0.1 Release 0.124
Merge branch 'android-msm-hammerhead-3.4-mnc-mr1-security-next' into android-msm-hammerhead-3.4-mnc-mr1