Merge "Adjust sepolicy-analyze to reflect libsepol changes."