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

Change-Id: I40fe12bce59e1ae1e87c1e2b80a9d343d2bf7829