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

Change-Id: Iad4d8712725819b35d9d25956fd82ff70ef3467d