Merge "DO NOT MERGE Add running time hints to CTS package config" into marshmallow-cts-dev am: 32ffe709ae  -s ours
am: be983a2e35

* commit 'be983a2e35450b5402001d3d777815250e04e14f':
  DO NOT MERGE Add running time hints to CTS package config