Merge "Coalesce generic_x86 and generic sepolicy where possible."