Merge "Fix CameraParameters2::OrderedKeyedVector::removeItem tautological-compare"
am: 2142e027a4

Change-Id: Ia1598e7f76d26e62bd23f700fc351bb6693bf669