Merge "sepolicy: Resolve full treble compilation issues for 8996/53/37"