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

Change-Id: I4420fc8e24d5e16bf06d3c8009368b4489929751