Merge "Simplify code paths computation, allow adb root to dump" into nyc-dev