clang fix:
TreeIteratorBase is a struct, not a class.

Change-Id: I450d8857fd8d16af2c6c22e731fd5653049c9c6b
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1-linaro