CompatibilityMatrix::combine() combines everything correctly
am: e7837b164c

Change-Id: I0b3d6cbb68493152c127c0478575de778c2d2b4e