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

Change-Id: I01ab14fdc0c0afcd91087cc64433aee0b3dc3da8