am 8af35956: resolved conflicts for merge of 4d372183 to klp-modular-dev-plus-aosp
am 8af35956: resolved conflicts for merge of 4d372183 to klp-modular-dev-plus-aosp

* commit '8af35956484d9cf14486c34eb652ff74fd6bd7d4':
  Fix stack overflow for mutual recursion.

treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst