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

Change-Id: I8ec48d21a0cc07125eee27a511f4a032fb11244a