Merge changes I89a8440f,Ifa3926e1
authorJames Zern <jzern@google.com>
Wed, 10 Jun 2015 19:18:03 +0000 (19:18 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 10 Jun 2015 19:18:04 +0000 (19:18 +0000)
* changes:
  libs.mk: relocate TEST_INTRA_PRED_SPEED_OBJS init
  test_intra_pred_speed: remove #if w/in another macro


Trivial merge