Merge changes from topic 'vts_deps'
authorTri Vo <trong@google.com>
Thu, 3 Aug 2017 20:15:19 +0000 (20:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 20:15:19 +0000 (20:15 +0000)
am: 7d149a564f

Change-Id: Idf236b741d7ff2cc529002218c34a3b4f0cf625c


Trivial merge