Merge "SIMD pavgb,w for x86/x86_64" am: 0d9ec0535c
am: 0381ce6b05

Change-Id: Ifa1a6a03d7e3deddb8d017b5977c5f2d25344b5c