Merge changes I2965e786,I144bedde

* changes:
  vpx_memset16: drop unnecessary local
  vpx_memset16: quiet signed/unsigned warning

vpx_mem/vpx_mem.c

diff --git a/vpx_mem/vpx_mem.c b/vpx_mem/vpx_mem.c
index c6f501a..b98fe83 100644
--- a/vpx_mem/vpx_mem.c
+++ b/vpx_mem/vpx_mem.c
@@ -93,11 +93,10 @@
 
 #if CONFIG_VP9_HIGHBITDEPTH
 void *vpx_memset16(void *dest, int val, size_t length) {
-  int i;
-  void *orig = dest;
-  uint16_t *dest16 = dest;
+  size_t i;
+  uint16_t *dest16 = (uint16_t *)dest;
   for (i = 0; i < length; i++)
     *dest16++ = val;
-  return orig;
+  return dest;
 }
 #endif  // CONFIG_VP9_HIGHBITDEPTH