Merge "build: always define NDEBUG in the static analyzer" am: 2e4fe5ad01
am: b0c86834cd

Change-Id: If729c39692ef214a89b108307d0facc70c0e21d5