am 3add9165: Support running a CTS test plan of instrumentation tests.

Merge commit '3add9165b98f974939698f606daf5f41904ec36f' into gingerbread-plus-aosp

* commit '3add9165b98f974939698f606daf5f41904ec36f':
  Support running a CTS test plan of instrumentation tests.