Merge "defconfig: msm8974: Enable Per-File-Tagger driver"