am 51e740f8: resolved conflicts for 32d86587 to mnc-dr-dev-plus-aosp

* commit '51e740f802083cc250a2f6228222bcbbcec79887':
  libutils: Fix integer overflows in VectorImpl.