am b4459d8d: (-s ours) am 7e79b9aa: am dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846"

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