tree 05871fb1d115062c88e86c2c74de0b3d213acdf8
parent 8f2ea671d9cbd0f21b6708f09a60bdd93c9183f1
parent d429b1f9e7e249233c333f013578cfcb1e21afd4
author Martijn Coenen <maco@google.com> 1505163197 +0000
committer android-build-merger <android-build-merger@google.com> 1505163197 +0000

Merge changes from topic "fix-omx-dependencies"
am: d429b1f9e7

Change-Id: Ic50e4bc973f6a16f0ed1a1f051dc354e69b0e39d