Merge "Libcore: Suppress CollectionIncompatibleType in tests" am: fa1f4a384e
am: 3a8c51c1c8

Change-Id: Idcd6f9e8cbc91a3d2e344ccb5300f4baaef998e2