Merge "Port two methods in checker-dead-blocks to Smali"