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

Change-Id: Icb62cdb45d90cfe839e322738a242fb31c805c99