Merge "Add indexOf method to ArrayMap & ArraySet" into lmp-dev