Merge "Sepolicy : Compilation fix"