Merge branch 'LA.BF64.1.2.2_rb4.7' of git://codeaurora.org/device/qcom/sepolicy into cm-13.0

Change-Id: Ia4d79c693cf01ca2e160e159cc05b313521f1aaa