am 8b474e12: am 800225b1: am ef3e6d97: Merge "Add indexOf method to ArrayMap & ArraySet" into lmp-dev

* commit '8b474e12f87d829e70e74468d7d3b80e070005ba':
  Add indexOf method to ArrayMap & ArraySet