am af4586a2: Merge "DO NOT MERGE Allow multiple deqp packages per API" into mnc-dev

* commit 'af4586a27fffabb76bc754ce61a41d16fd0fea1e':
  DO NOT MERGE Allow multiple deqp packages per API