Merge "Fix bug in hierarchy handling of multidex tool."