am 246daf75: resolved conflicts for merge of 2b5d2c55 to klp-dev-plus-aosp

* commit '246daf755a6607db575b5bef13d5cc761d4ebbb0':
  Add "WITH_STATIC_ANALYZER=1 m/mm/mmm/mma/mmma ..."