Merge "Require armv6/media when building armv7"