am 3245c2e4: am 5017f3f2: Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846"

* commit '3245c2e4008b40e05db44ef7c897d0aa7b88c1d7':
  Support wrapping app processes to inject debug instrumentation. Bug: 4437846