Merge "Fix missing dependency in sepolicy mapping file rules"