Merge "ART: Fix order of operations in HBasicBlock::DisconnectAndDelete"