Merge "Include vpx_config.h in vpx_timer.h"