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

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