Merge 4.16

Change-Id: I11db70a8e25a6656c5ec640a703e7b06d5a3672e

payloads/libpayload/include/assert.h

@@ -29,6 +29,17 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#ifdef __TEST__
+
+/* CMocka function redefinition */
+void mock_assert(const int result, const char *const expression, const char *const file,
+		 const int line);
+
+#define MOCK_ASSERT(result, expression) mock_assert((result), (expression), __FILE__, __LINE__)
+#define assert(statement) MOCK_ASSERT(!!(statement), #statement)
+
+#else
+
 // assert's existence depends on NDEBUG state on _last_ inclusion of assert.h,
 // so don't guard this against double-includes.
 #ifdef NDEBUG
@@ -43,3 +54,5 @@
 		abort();					\
 	}
 #endif
+
+#endif /* __TEST__ */