Merge "Declare methods in binder opcode order"