Merge "CTS: Support other test metric types." into nyc-dev
am: 054bec79ab

* commit '054bec79abb50148dc59ef558e86686c153e3a50':
  CTS: Support other test metric types.

Change-Id: I474613a8514b474aae239192b65a6da5f49fe2f0