Merge changes from topic "fix-omx-dependencies" am: 2dac833ea8 -s ours

am: 359358789a  -s ours

Change-Id: I776dc849262326097cd031d95470981619164916
This commit is contained in:
Steven Moreland 2017-09-11 21:21:27 +00:00 committed by android-build-merger
commit 67525dde9c

Diff content is not available