Merge changes Iecdbbc34,I8b4db93f
authorJames Zern <jzern@google.com>
Fri, 31 Jul 2015 22:22:48 +0000 (22:22 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 31 Jul 2015 22:22:48 +0000 (22:22 +0000)
commite184b613b9684c48385f45c78c160a64061f26fa
treecdf630e8618c7e0fcb81f339733bbdd5d1eec3d8
parent6025c6d65bacea0c72e02ee498bd3e82f92c9141
parent21da45e570ad8fa841313614adb4c0f6ab6fac37
Merge changes Iecdbbc34,I8b4db93f

* changes:
  Android.mk: fix *_rtcd.h deps for armeabi-v7a
  Android.mk: add a dep on vpx_config.asm for x86_64