libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_onyx.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 VP9_COMMON_VP9_ONYX_H_
 #define VP9_COMMON_VP9_ONYX_H_
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
 #include "vpx/internal/vpx_codec_internal.h"
 #include "vpx/vp8cx.h"
 #include "vpx_scale/yv12config.h"
-#include "vp9/common/vp9_type_aliases.h"
 #include "vp9/common/vp9_ppflags.h"
   typedef int *VP9_PTR;
 
   /* Create/destroy static data structures. */
 
   typedef enum {
     NORMAL      = 0,
     FOURFIVE    = 1,
     THREEFIVE   = 2,
     ONETWO      = 3
@@ skipping 181 matching lines @@
 
   int vp9_set_internal_size(VP9_PTR comp,
                             VPX_SCALING horiz_mode, VPX_SCALING vert_mode);
 
   int vp9_get_quantizer(VP9_PTR c);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif  // __INC_ONYX_H
+#endif  // VP9_COMMON_VP9_ONYX_H_