libvpx: Pull from upstream

source/libvpx/vpx_mem/include/vpx_mem_intrnl.h

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 
 #ifndef __VPX_MEM_INTRNL_H__
 #define __VPX_MEM_INTRNL_H__
-#include "vpx_ports/config.h"
+#include "./vpx_config.h"
 
 #ifndef CONFIG_MEM_MANAGER
 # if defined(VXWORKS)
 #  define CONFIG_MEM_MANAGER  1 /*include heap manager functionality,*/
 /*default: enabled on vxworks*/
 # else
 #  define CONFIG_MEM_MANAGER  0 /*include heap manager functionality*/
 # endif
 #endif /*CONFIG_MEM_MANAGER*/
 
@@ skipping 65 matching lines @@
 #if REMOVE_PRINTFS
 # define _P(x)
 #else
 # define _P(x) x
 #endif
 
 /*returns an addr aligned to the byte boundary specified by align*/
 #define align_addr(addr,align) (void*)(((size_t)(addr) + ((align) - 1)) & (size_t)-(align))
 
 #endif /*__VPX_MEM_INTRNL_H__*/