Merge "Fix CameraParameters2::OrderedKeyedVector::removeItem tautological-compare" am: 2142e027a4 am: 6b5f42dcc5
am: 7be4072d4a

Change-Id: Iad4a9c1ee59ebbadd8708df5c5a32a57b34c19df