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

Change-Id: If844188720f71816bcc4ec07a1aa8b3a3492e716