Merge changes I05b3028a,I1ad41c09 * changes: vpx_dsp_common.h: remove circular include vpx_dsp_common.h: fix include guard