Merge \"Simplify code paths computation, allow adb root to dump\" into nyc-dev
am: 1c4da6654f

Change-Id: I6c433663b5b3330f34a731ab32f15b5964649098