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

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