Sepolicy: Clean up moved files

Coalesce statements to clean up policies.

Test: m
Change-Id: I3794d6bf1bce04e700d2d8e3365249cf75bd527d
3 files changed