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

Change-Id: I92473ef245fb55dca7b1dbfee824eb401b50001b