Fix build for c99

Fix two implicit declarations to allow clang building.

Change-Id: I934e7d455b22e55e0572ccd40f351ec5b50acb4d
Merge "Fix build for c99"
am 6435abb2: Merge "Fix build for c99"

* commit '6435abb2c5883ceb85598a9c690ea8f744df6b5f':
  Fix build for c99
jpeg: fix compiling for 64-bit

Cast pointers to uintptr_t instead of int to test alignment.

Change-Id: If959132a4bc52a151bcbe03702b24f4a202bfb1c
Merge "jpeg: fix compiling for 64-bit"
AArch64: Correction of definition of UINT32

In an #ifdef ENABLE_ANDROID_NULL_CONVERT...#endif section of the
jccolor.c module UINT32 was defined as unsigned long, which is OK
for 32-bit systems but incorrect for __LP64__ systems such as AArch64.
The definition of UINT32 has been changed to unsigned int, which is
32-bits on both 32-bit and __LP64__ systems.

Change-Id: I5e29db2ea0690ce3623bb54aa1138aa3f772df76
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Merge "AArch64: Correction of definition of UINT32"
Merge branch 'aosp'