Merge "Fix build when #define LOG_NDEBUG 0"
am: 1b4c5978d1

Change-Id: I8850574faa5a1611f99e8fe771d5f4f865271f78