Merge "Update incompatibilities.txt."
am: bf50c047b9

Change-Id: Iacf0d07d6bc33c8b631bf5634e1949b4f49dda8e