x246: fix for iOS and cleanup

Change-Id: Ib26c2977182e61dc25eb2beb9670bc5268757fad

contrib/src/x264/remove-align.patch

---- x264/configure	2013-03-01 16:21:59.000000000 -0500
-+++ x264patched/configure	2015-01-14 14:11:27.000000000 -0500
-@@ -456,7 +456,7 @@
-         ;;
-     darwin*)
-         SYS="MACOSX"
--        CFLAGS="$CFLAGS -falign-loops=16"
-+        CFLAGS="$CFLAGS"
-         libm="-lm"
-         if [ "$pic" = "no" ]; then
-             cc_check "" -mdynamic-no-pic && CFLAGS="$CFLAGS -mdynamic-no-pic"

contrib/src/x264/rules.mak

@@ -52,8 +52,12 @@ x264: x264-$(X264_HASH).tar.xz .sum-x264
 .x264: x264
 ifdef HAVE_ANDROID
 	cd $< && $(HOSTVARS) AS="$(CC)" ./configure $(X264CONF)
+else
+ifdef HAVE_IOS
+	cd $< && $(HOSTVARS) ASFLAGS="$(CFLAGS)" ./configure $(X264CONF)
 else
 	cd $< && $(HOSTVARS) ./configure $(X264CONF)
+endif
 endif
 	cd $< && $(MAKE) install
 	touch $@