am ad6107c3: Merge "Coalesce generic_x86 and generic sepolicy where possible."

* commit 'ad6107c3e9901ce520eedcad7770a3a9e4f327d8':
  Coalesce generic_x86 and generic sepolicy where possible.