Merge "Seandroid: replacing policies with macro"