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

Change-Id: I6e5f9e8f156e180b877e085ea061e59fbe51dc12