Merge "Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap." am: 0bedc8e14c am: 0c15140dad
am: b8c4ae9f80

Change-Id: I14dcce3a6b967fdbe33854f325a89f7a4963a630