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

Change-Id: Iced1a1c1914d30b9321ebc03eb1bb922bf51f7eb