Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am: e71e3bbacd
authorPyry Haulos <phaulos@google.com>
Wed, 21 Dec 2016 23:07:05 +0000 (23:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Dec 2016 23:07:05 +0000 (23:07 +0000)
am: 5332103bc2

Change-Id: I2819b5fa50c9c2a939d74b2f0aff167e7279af6c


Trivial merge