Merge "seandroid: Adding policy from other directories"