Fix and add test to CompatibilityMatrix::combine()
am: 5390e3b2cb

Change-Id: I757e16593d04d9ff2001f7667eaa524eee28f637