Merge changes from topic 'am-47c303cab10f49afaaaf3929a6369684' into nyc-mr1-dev-plus...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 13 Sep 2016 17:11:37 +0000 (17:11 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 13 Sep 2016 17:11:38 +0000 (17:11 +0000)
* changes:
  Merge changes I85492417,I93389a2c into nougat-cts-dev am: 37eaa88ac2 am: a7dc5ef89b am: 4b783d2db9 am: 00ca87ab81 am: 1209ca758b
  CP: Limit VkInstance count in object_management.multithreaded* am: 1735b7bcaa am: d030a8fd2b am: fc557472cb am: b4ba085af5 am: 7bf802cc00
  CP: Do not test VkDevice, VkInstance creation OOM paths in WSI tests am: 80ddee1f9b am: 96a5fefcf2 am: f8e9fa9d52 am: 33bde8aa3e am: 3a0c9dfeba


Trivial merge