Merge "tools_common: fix build w/encoders/decoders disabled"
authorJames Zern <jzern@google.com>
Wed, 12 Aug 2015 01:52:55 +0000 (01:52 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 12 Aug 2015 01:52:55 +0000 (01:52 +0000)

Trivial merge