am 12984752: (-s ours) resolved conflicts for merge of fcdf653a to klp-dev-plus-aosp

* commit '129847526a198182677a84f83e30e91a61341531':
  Add "WITH_SYNTAX_CHECK=1 make ..."