Merge "Remove WITH_SYNTAX_CHECK"
am: c114bd9dbf

Change-Id: I9e6c2a9c6aa48e27efe9b32d496ca21f47d4a447