am 43286266: Merge "Change tools:list_item to listitem." into mnc-dev

* commit '432862667643cf8966a0c727b6772a6bae787da1':
  Change tools:list_item to listitem.